aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2012-11-08 23:05:24 +0200
committerJukka Jylänki <jujjyl@gmail.com>2012-11-08 23:05:24 +0200
commit599de9178e22b2433274faedcdf695622846e084 (patch)
tree2cd8afeb7244fac56539f57f38cc5ab5291e3715
parent118a6bd6c5aca371ecfcf9f7baf748a7dfd43351 (diff)
Fix test_conftest_s_flag_passing (__main__.other) from leaking behind an environment variable EMMAKEN_JUST_CONFIGURE=1 if the test fails. This would cause all subsequent tests in the test runner to also fail.
-rwxr-xr-xtests/runner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/runner.py b/tests/runner.py
index a572b4ee..52d11ebf 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -8226,9 +8226,9 @@ fscanfed: 10 - hello
os.environ["EMMAKEN_JUST_CONFIGURE"] = "1"
cmd = ['python', EMCC, '-s', 'ASSERTIONS=1', os.path.join(self.get_dir(), 'conftest.c'), '-o', 'conftest']
output = Popen(cmd, stderr=PIPE).communicate()
+ del os.environ["EMMAKEN_JUST_CONFIGURE"]
self.assertNotContained('emcc: warning: treating -s as linker option', output[1])
assert os.path.exists('conftest')
- del os.environ["EMMAKEN_JUST_CONFIGURE"]
def test_crunch(self):
# crunch should not be run if a .crn exists that is more recent than the .dds