summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--test-chill/testchill/__main__.py2
-rw-r--r--test-chill/testchill/chill.py6
-rw-r--r--test-chill/testchill/util.py2
4 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 14fe22c..5b091df 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
CC = g++
CFLAGS = -g -Wno-write-strings
DEPENDENCE_CFLAGS = -M
-OMEGAHOME = ./omega
+OMEGAHOME ?= ./omega
ifdef TEST_COVERAGE
CFLAGS := $(CFLAGS) -fprofile-arcs -ftest-coverage
diff --git a/test-chill/testchill/__main__.py b/test-chill/testchill/__main__.py
index ae9f29e..ec60ad1 100644
--- a/test-chill/testchill/__main__.py
+++ b/test-chill/testchill/__main__.py
@@ -170,7 +170,7 @@ def add_local_args(arg_parser):
Command line arguments for the local command
@param arg_parser The local ArgumentParser object
"""
- arg_parser.add_argument('chill_dir', metavar='chill-home')
+ arg_parser.add_argument('chill_dir', metavar='chill-home', default='../')
arg_parser.add_argument('-v', '--chill-branch', dest='chill_version', default='dev', choices=['release','dev'])
# - Testing should consider all interface languages. Will uncomment if testing takes too long
# arg_parser.add_argument('-i', '--interface-lang', nargs=1, action='append', dest='chill_script_lang_list', choices=['script','lua','python'])
diff --git a/test-chill/testchill/chill.py b/test-chill/testchill/chill.py
index bfd9c81..b881ef4 100644
--- a/test-chill/testchill/chill.py
+++ b/test-chill/testchill/chill.py
@@ -54,11 +54,11 @@ class ChillConfig(object):
def _buildfunc(self, cc, link=True):
if not link:
- compile_args = ['-c']
+ compile_args = ['-c -Wuninitialized']
elif link and cc == 'nvcc':
- compile_args = ['-L/usr/local/cuda/lib64/lib', '-lcuda', '-lcudart', '-lstdc++', '-lrt']
+ compile_args = ['-L/usr/local/cuda/lib64/lib', '-lcuda', '-lcudart', '-lstdc++', '-lrt', '-Wuninitialized']
else:
- compile_args = ['-lstdc++', '-lrt']
+ compile_args = ['-lstdc++', '-lrt', '-Wuninitialized']
def build(src, dest, args=[], defines={}, wd=None):
if wd is None:
diff --git a/test-chill/testchill/util.py b/test-chill/testchill/util.py
index cfb61dd..266a94d 100644
--- a/test-chill/testchill/util.py
+++ b/test-chill/testchill/util.py
@@ -138,7 +138,7 @@ def callonce(func):
globals()[pred_name] = True
return func(*args, **kwargs)
else:
- raise Exception
+ raise Exception('{} was invoked multiple times.'.format(func.__name___))
return wrapper
def isdiff(strone, strtwo):