diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c312f2bb69..1c666039ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,9 @@ # Global variables (will be set in every job): variables: WARN_AS_ERROR: "1" + MAKEFLAGS: "-s" REALM_BACKTRACE: "1" REALM_SYNTHETIC_CORE_MAP: "" # Disable Realm thread pinning. - TEST_REGENT: "1" # Local variables (included on a case-by-case basis in each job): .gcc48: &gcc48 diff --git a/.travis.yml b/.travis.yml index 8aa4569a3c..d2fab25f98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ compiler: env: global: - WARN_AS_ERROR=1 + - MAKEFLAGS="-s" - REALM_SYNTHETIC_CORE_MAP="" matrix: - CC_FLAGS="-std=c++98" DEBUG=0 diff --git a/language/travis.py b/language/travis.py index 4c06bfbe91..aae571c061 100755 --- a/language/travis.py +++ b/language/travis.py @@ -57,8 +57,5 @@ def test(root_dir, debug, spy, env): 'LG_RT_DIR': runtime_dir, 'LUAJIT_URL': 'http://legion.stanford.edu/~eslaught/mirror/LuaJIT-2.0.4.tar.gz', }) - # reduce output spewage by default - if 'MAKEFLAGS' not in env: - env['MAKEFLAGS'] = 's' test(root_dir, env['DEBUG'], 'TEST_SPY' in env and env['TEST_SPY'] == '1', env) diff --git a/test.py b/test.py index 520dcafc0b..805ce435bc 100755 --- a/test.py +++ b/test.py @@ -50,7 +50,7 @@ def run_cxx(tests, flags, launcher, root_dir, env, thread_count): for test_file, test_flags in tests: test_path = os.path.join(root_dir, test_file) test_dir = os.path.dirname(test_path) - cmd(['make', '-s', '-C', test_dir, '-j', str(thread_count)], env=env) + cmd(['make', '-C', test_dir, '-j', str(thread_count)], env=env) cmd(launcher + [test_path] + flags + test_flags, env=env, cwd=test_dir) def run_test_tutorial(launcher, root_dir, tmp_dir, env, thread_count): @@ -69,12 +69,12 @@ def run_test_fuzzer(launcher, root_dir, tmp_dir, env, thread_count): def run_test_realm(launcher, root_dir, tmp_dir, env, thread_count): test_dir = os.path.join(root_dir, 'test/realm') - cmd(['make', '-s', '-C', test_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'USE_CUDA=0', 'USE_GASNET=0', 'clean'], env=env) - cmd(['make', '-s', '-C', test_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'USE_CUDA=0', 'USE_GASNET=0', 'run_all'], env=env) + cmd(['make', '-C', test_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'USE_CUDA=0', 'USE_GASNET=0', 'clean'], env=env) + cmd(['make', '-C', test_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'USE_CUDA=0', 'USE_GASNET=0', 'run_all'], env=env) perf_dir = os.path.join(root_dir, 'test/performance/realm') - cmd(['make', '-s', '-C', perf_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'clean_all'], env=env) - cmd(['make', '-s', '-C', perf_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'run_all'], env=env) + cmd(['make', '-C', perf_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'clean_all'], env=env) + cmd(['make', '-C', perf_dir, 'DEBUG=0', 'SHARED_LOWLEVEL=0', 'run_all'], env=env) def run_test_external(launcher, root_dir, tmp_dir, env, thread_count): flags = ['-logfile', 'out_%.log'] @@ -91,7 +91,7 @@ def run_test_private(launcher, root_dir, tmp_dir, env, thread_count): miniaero_dir = os.path.join(tmp_dir, 'miniaero-spmd') cmd(['git', 'clone', '-b', 'spmd_flattened_superblocks', 'git@github.com:magnatelee/miniaero-spmd.git', miniaero_dir]) - cmd(['make', '-s', '-C', miniaero_dir, '-j', str(thread_count)], env=env, + cmd(['make', '-C', miniaero_dir, '-j', str(thread_count)], env=env, cwd=miniaero_dir) for test in ['3D_Sod', '3D_Sod_2nd_Order', 'FlatPlate', 'Ramp']: test_dir = os.path.join(miniaero_dir, 'tests', test) @@ -108,7 +108,7 @@ def build_cmake(root_dir, tmp_dir, env, thread_count, def clean_cxx(tests, root_dir, env, thread_count): for test_file, test_flags in tests: test_dir = os.path.dirname(os.path.join(root_dir, test_file)) - cmd(['make', '-s', '-C', test_dir, 'clean'], env=env) + cmd(['make', '-C', test_dir, 'clean'], env=env) def build_make_clean(root_dir, env, thread_count, test_tutorial, test_examples): if test_tutorial: