Extract out some variables

Author: stevenfontanella

check.py

@@ -210,19 +210,21 @@ def run_spec_tests():
     print('\n[ checking wasm-shell spec testcases... ]\n')
 
     def run_one(wast: Path, stdout=None, stderr=None):
-        base = wast.name
-        print('..', base, file=stdout)
+        test_name = wast.name
+        base_name = "-".join(wast.parts[-3:])
+
+        print('..', test_name, file=stdout)
         # windows has some failures that need to be investigated
-        if base == 'names.wast' and shared.skip_if_on_windows('spec: ' + base):
+        if test_name == 'names.wast' and shared.skip_if_on_windows('spec: ' + test_name):
             return
 
-        expected = os.path.join(shared.get_test_dir('spec'), 'expected-output', base + '.log')
+        expected = os.path.join(shared.get_test_dir('spec'), 'expected-output', test_name + '.log')
 
         # some spec tests should fail (actual process failure, not just assert_invalid)
         try:
             actual = run_spec_test(str(wast), stdout=stdout, stderr=stderr)
         except Exception as e:
-            if ('wasm-validator error' in str(e) or 'error: ' in str(e)) and '.fail.' in base:
+            if ('wasm-validator error' in str(e) or 'error: ' in str(e)) and '.fail.' in test_name:
                 print('<< test failed as expected >>', file=stdout)
                 return  # don't try all the binary format stuff TODO
             else:
@@ -233,25 +235,25 @@ def run_one(wast: Path, stdout=None, stderr=None):
         # check binary format. here we can verify execution of the final
         # result, no need for an output verification
         actual = ''
-        with open("-".join(wast.parts[-3:]) + ".transformed", 'w') as transformed_spec_file:
+        with open(base_name + ".transformed", 'w') as transformed_spec_file:
             for i, (module, asserts) in enumerate(support.split_wast(str(wast))):
                 if not module:
                     # Skip any initial assertions that don't have a module
                     return
                 print(f'        testing split module {i}', file=stdout)
-                split_name = "-".join(wast.parts[-3:]) + f'_split{i}.wast'
+                split_name = base_name + f'_split{i}.wast'
                 support.write_wast(split_name, module)
                 run_opt_test(split_name, stdout=stdout, stderr=stderr)    # also that our optimizer doesn't break on it
 
-                result_wast_file = shared.binary_format_check(split_name, verify_final_result=False, base_name="-".join(wast.parts[-3:]), stdout=stdout, stderr=stderr)
+                result_wast_file = shared.binary_format_check(split_name, verify_final_result=False, base_name=base_name, stdout=stdout, stderr=stderr)
                 with open(result_wast_file) as f:
                     result_wast = f.read()
                     # add the asserts, and verify that the test still passes
                     transformed_spec_file.write(result_wast + '\n' + '\n'.join(asserts))
 
         # compare all the outputs to the expected output
-        actual = run_spec_test("-".join(wast.parts[-3:]) + ".transformed", stdout=stdout, stderr=stderr)
-        check_expected(actual, os.path.join(shared.get_test_dir('spec'), 'expected-output', base + '.log'), stdout=stdout)
+        actual = run_spec_test(base_name + ".transformed", stdout=stdout, stderr=stderr)
+        check_expected(actual, os.path.join(shared.get_test_dir('spec'), 'expected-output', test_name + '.log'), stdout=stdout)
 
     output_queue = queue.Queue()