diff options
| -rw-r--r-- | src/modules.js | 4 | ||||
| -rw-r--r-- | tests/settings.py | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/modules.js b/src/modules.js index 804de24a..bf9383ce 100644 --- a/src/modules.js +++ b/src/modules.js @@ -18,8 +18,8 @@ var Debugging = { var metadataToParentMetadata = {}; var metadataToFilename = {}; - var form1 = new RegExp(/^ .*, !dbg !(\d+) +$/); - var form2 = new RegExp(/^ .*, !dbg !(\d+) +; .*$/); + var form1 = new RegExp(/^ .*, !dbg !(\d+) *$/); + var form2 = new RegExp(/^ .*, !dbg !(\d+) *; .*$/); var form3 = new RegExp(/^!(\d+) = metadata !{i32 (\d+), i32 \d+, metadata !(\d+), .*}$/); var form3a = new RegExp(/^!(\d+) = metadata !{i32 \d+, metadata !\d+, i32 \d+, i32 \d+, metadata !(\d+), i32 \d+} ; \[ DW_TAG_lexical_block \]$/); var form3ab = new RegExp(/^!(\d+) = metadata !{i32 \d+, i32 \d+, metadata !(\d+), .*$/); diff --git a/tests/settings.py b/tests/settings.py index cf3564ca..50619a07 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,10 +1,8 @@ TEMP_DIR='/dev/shm' -#LLVM_ROOT=os.path.expanduser('~/Dev/llvm-2.8/cbuild/Release/bin') -LLVM_ROOT=os.path.expanduser('~/Dev/llvm-svn/build/Release+Asserts/bin') +LLVM_ROOT=os.path.expanduser('~/Dev/llvm-2.9/cbuild/bin') -#LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-4.2-2.8.source/cbuild/install/bin/llvm-g++') -LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-svn/cbuild/install/bin/llvm-g++') +LLVM_GCC=os.path.expanduser('~/Dev/llvm-gcc-2.9/cbuild/install/bin/llvm-g++') COMPILER_OPTS = ['-m32'] # Need to build as 32bit arch, for now - # various errors on 64bit compilation @@ -19,8 +17,6 @@ V8_ENGINE = [os.path.expanduser('~/Dev/v8/d8')] COMPILER_ENGINE=V8_ENGINE JS_ENGINE=V8_ENGINE -JS_ENGINE_PARAMS = ['--'] # For V8 -JS_ENGINE_PARAMS = [] # For SpiderMonkey TIMEOUT = None |