feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Make QRegExp dumper test pass on Mac

Browse Source 
We need DYLD_IMAGE_SUFFIX=_debug for the captures()
cache warming call to succeed even if the actual access
is by offset only.

Change-Id: I24a90b4c4187459904f14a664b992a5bba9a20eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2016-11-15 13:31:46 +01:00
parent 3508a09010
commit 5b058ebb34
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/debugger/qttypes.py
View File

@@ -1064,6 +1064,7 @@ def qdump__QRegExp(d, value):
privAddress = d.extractPointer(value) privAddress = d.extractPointer(value)
(eng, pattern) = d.split('p{QString}', privAddress) (eng, pattern) = d.split('p{QString}', privAddress)
d.putStringValue(pattern) d.putStringValue(pattern)
d.putNumChild(1)
if d.isExpanded(): if d.isExpanded():
with Children(d): with Children(d):
d.call('void', value, 'capturedTexts') # Warm up internal cache. d.call('void', value, 'capturedTexts') # Warm up internal cache.

1
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -2755,6 +2755,7 @@ void tst_Dumpers::dumper_data()
"int pos1 = re.indexIn(str1); unused(&pos1);\n" "int pos1 = re.indexIn(str1); unused(&pos1);\n"
"int pos2 = re.indexIn(str2); unused(&pos2);\n") "int pos2 = re.indexIn(str2); unused(&pos2);\n")
+ CoreProfile() + CoreProfile()
+ UseDebugImage()
+ Check("re", "\"a(.*)b(.*)c\"", "@QRegExp") + Check("re", "\"a(.*)b(.*)c\"", "@QRegExp")
+ Check("re.captures.0", "[0]", "\"a1121b344c\"", "@QString") + Check("re.captures.0", "[0]", "\"a1121b344c\"", "@QString")
+ Check("re.captures.1", "[1]", "\"1121\"", "@QString") + Check("re.captures.1", "[1]", "\"1121\"", "@QString")