Merge pull request #1189 from kmod/extra_tests

Reenable the 'extra' tests

CMakeLists.txt

@@ -350,8 +350,7 @@ endif()
 add_pyston_test(defaults cpython --exit-code-only --skip-failing -t100)
 add_pyston_test(defaults integration --exit-code-only --skip-failing -t600)
 if(ENABLE_EXTRA_TESTS)
-# XXX: reenable
-# add_pyston_test(defaults extra -t900 --exit-code-only)
+  add_pyston_test(defaults extra -t900 --exit-code-only)
 endif()
 
 

src/jit.cpp

@@ -509,7 +509,7 @@ static int main(int argc, char** argv) noexcept {
                 free(real_path);
 
                 try {
-                    AST_Module* ast = caching_parse_file(fn, /* future_flags = */ 0);
+                    AST_Module* ast = parse_file(fn, /* future_flags = */ 0);
                     compileAndRunModule(ast, main_module);
                     rtncode = 0;
                 } catch (ExcInfo e) {

test/extra/cffi_test.py

+# Note: the expected counts here are set to match the CI, and I can't re[rpduce them locally
 import os, sys, subprocess, shutil
 sys.path.append(os.path.dirname(__file__) + "/../lib")
 
@@ -24,9 +25,9 @@ def install_and_test_cffi():
 
     # looks like clang 3.5 causes more errors like: 214 != -42 doing casts
     if os.environ.has_key("CC") and "clang" in os.environ["CC"]:
-        expected = [{ "failed": 58, "passed": 1619, "skipped": 70, "xfailed": 4, "error": 5 }]
+        expected = [{ "failed": 34, "passed": 1643, "skipped": 70, "xfailed": 4, "error": 5 }]
     else:
-        expected = [{ "failed": 49, "passed": 1628, "skipped": 70, "xfailed": 4, "error": 5 }]
+        expected = [{ "failed": 25, "passed": 1652, "skipped": 70, "xfailed": 4, "error": 5 }]
     run_test([PYTEST_EXE], cwd=CFFI_DIR, expected=expected)
    
 create_virtenv(ENV_NAME, ["pytest==2.8.7", "py==1.4.31", "pycparser==2.14"], force_create = True)

test/extra/sass_test.py

-# skip-if: 'clang' in os.environ['CC']
+# skip-if: 'clang' in os.environ.get('CC', '')
 # looks like libsass only builds using gcc...
 import os, sys, subprocess
 sys.path.append(os.path.dirname(__file__) + "/../lib")

test/tests/no_pyc_check.py

+import os.path
+try:
+    assert not os.path.exists(__file__ + 'c')
+except AssertionError:
+    os.unlink(__file__ + 'c')
+    raise