These tests passed now

pyston · Jul 19, 2016 · 0483605 · 0483605
1 parent 142a337
commit 0483605
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,8 +56,6 @@ addons:
     - libxml2-dev
     - libxslt1-dev
     - libssl-dev
-    - libtk8.5
-    - libtcl8.5
     - tcl8.5-dev
     - tk8.5-dev
     - swig
@@ -79,6 +77,9 @@ install:
 
 before_script:
   - mysql -e 'create database mysqldb_test charset utf8;'
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - sleep 3 # give xvfb some time to start
 
 script:
   - ccache -z

diff --git a/from_cpython/Lib/test/test_cgi.py b/from_cpython/Lib/test/test_cgi.py
@@ -1,4 +1,3 @@
-# expected: fail
 from test.test_support import run_unittest, check_warnings
 import cgi
 import os

diff --git a/from_cpython/Lib/test/test_richcmp.py b/from_cpython/Lib/test/test_richcmp.py
@@ -1,4 +1,3 @@
-# expected: fail
 # Tests for rich comparisons
 
 import unittest

diff --git a/from_cpython/Lib/test/test_tk.py b/from_cpython/Lib/test/test_tk.py
@@ -7,8 +7,9 @@
 test_support.requires('gui')
 
 this_dir = os.path.dirname(os.path.abspath(__file__))
-lib_tk_test = os.path.abspath(os.path.join(this_dir, os.path.pardir,
-    'lib-tk', 'test'))
+lib_tk_test = os.path.abspath(os.path.join(this_dir, '../../from_cpython/Lib', 'lib-tk', 'test'))
+# lib_tk_test = os.path.abspath(os.path.join(this_dir, os.path.pardir,
+#     'lib-tk', 'test'))
 
 with test_support.DirsOnSysPath(lib_tk_test):
     import runtktests

diff --git a/from_cpython/Lib/test/test_ttk_guionly.py b/from_cpython/Lib/test/test_ttk_guionly.py
@@ -1,4 +1,3 @@
-# expected: fail
 import os
 import unittest
 from test import test_support
@@ -8,8 +7,10 @@
 test_support.requires('gui')
 
 this_dir = os.path.dirname(os.path.abspath(__file__))
-lib_tk_test = os.path.abspath(os.path.join(this_dir, os.path.pardir,
-    'lib-tk', 'test'))
+# Pyston change: modify the search path
+lib_tk_test = os.path.abspath(os.path.join(this_dir, '../../from_cpython/Lib', 'lib-tk', 'test'))
+# lib_tk_test = os.path.abspath(os.path.join(this_dir, os.path.pardir,
+#     'lib-tk', 'test'))
 
 with test_support.DirsOnSysPath(lib_tk_test):
     import runtktests

diff --git a/from_cpython/Lib/test/test_ttk_textonly.py b/from_cpython/Lib/test/test_ttk_textonly.py
@@ -1,12 +1,13 @@
-# expected: fail
 import os
 from test import test_support
 
 # Skip this test if _tkinter does not exist.
 test_support.import_module('_tkinter')
 
 this_dir = os.path.dirname(os.path.abspath(__file__))
-lib_tk_test = os.path.abspath(os.path.join(this_dir, '..', 'lib-tk', 'test'))
+# Pyston change: modify the search path
+lib_tk_test = os.path.abspath(os.path.join(this_dir, '../../from_cpython/Lib', 'lib-tk', 'test'))
+# lib_tk_test = os.path.abspath(os.path.join(this_dir, '../../from_cpython/Lib','lib-tk', 'test))
 
 with test_support.DirsOnSysPath(lib_tk_test):
     import runtktests

diff --git a/from_cpython/setup.py b/from_cpython/setup.py
@@ -174,7 +174,7 @@ def tkinkter_ext():
 
     # Hack: Just hardcode the includes dir and tcl/tk lib dir like our cffi ext.
     # May want something more robust later.
-    tcl_inc = ['/usr/include/tcl']
+    tcl_inc = ['/usr/include/tcl8.5']
     tcl_lib = "tcl8.5"
     tk_lib = "tk8.5"
 

diff --git a/src/runtime/builtin_modules/thread.cpp b/src/runtime/builtin_modules/thread.cpp
@@ -233,9 +233,9 @@ void setupThread() {
                                              FunctionMetadata::create((void*)getIdent, BOXED_INT, 0), "get_ident"));
     thread_module->giveAttr("stack_size", new BoxedBuiltinFunctionOrMethod(
                                               FunctionMetadata::create((void*)stackSize, BOXED_INT, 0), "stack_size"));
-    thread_module->giveAttr("interrupt_main", new BoxedBuiltinFunctionOrMethod(
-                FunctionMetadata::create((void*)interruptMain, UNKNOWN, 0), "interrupt_main"
-                ));
+    thread_module->giveAttr(
+        "interrupt_main",
+        new BoxedBuiltinFunctionOrMethod(FunctionMetadata::create((void*)interruptMain, UNKNOWN, 0), "interrupt_main"));
     thread_module->giveAttr("_count", new BoxedBuiltinFunctionOrMethod(
                                           FunctionMetadata::create((void*)threadCount, BOXED_INT, 0), "_count"));
 

diff --git a/test/CPYTHON_TEST_NOTES.md b/test/CPYTHON_TEST_NOTES.md
@@ -32,7 +32,6 @@ test_bz2                leaks
 test_capi               [unknown]
 test_cd                 [unknown]
 test_cfgparser          works when run from inside the from_cpython dir
-test_cgi                leaks
 test_class              needs ellipsis
 test_cl                 [unknown]
 test_cmd_line_script    [unknown]
@@ -139,7 +138,6 @@ test_pydoc              [unknown]
 test_random             long("invalid number")
 test_repr               complex.__hash__; some unknown issues
 test_resource           fails on travis-ci: setrlimit RLIMIT_CPU not allowed to raise maximum limit
-test_richcmp            PyObject_Not
 test_runpy              [unknown]
 test_scope              eval of code object from existing function (not currently supported)
 test_scriptpackages     [unknown]
@@ -166,14 +164,12 @@ test_tempfile           [unknown]
 test_threading_local    [unknown]
 test_threading          [unknown]
 test_thread             [unknown]
-test_tk                 [unknown]
+test_tk                 references leak, test files setting
 test_tokenize           [unknown]
 test_tools              [unknown]
 test_traceback          [unknown]
 test_trace              [unknown]
 test_transformer        [unknown]
-test_ttk_guionly        [unknown]
-test_ttk_textonly       [unknown]
 test_types              PyErr_WarnEx
 test_undocumented_details   function.func_closure
 test_unicode            argument passing issue?