Merge pull request #1363 from kmod/cpython_tests

Take a pass over the CPython tests

Author: kmod

CMakeLists.txt

@@ -333,7 +333,7 @@ endmacro()
 add_pyston_test(defaults tests --order-by-mtime -t50)
 add_pyston_test(force_llvm tests -a=-n -t90)
 if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
-  add_pyston_test(max_compilation_tier tests -a=-O -t50)
+  add_pyston_test(max_compilation_tier tests -a=-L -t50)
 endif()
 add_pyston_test(defaults cpython --exit-code-only --skip-failing -t100)
 add_pyston_test(defaults integration --exit-code-only --skip-failing -t900)

Makefile

@@ -31,8 +31,8 @@ GTEST_DIR := $(DEPS_DIR)/gtest-1.7.0
 
 USE_DEBUG_LIBUNWIND := 0
 
-MAX_MEM_KB := 500000
-MAX_DBG_MEM_KB := 500000
+MAX_MEM_KB := 1500000
+MAX_DBG_MEM_KB := 1500000
 
 TEST_THREADS := 1
 
@@ -411,10 +411,10 @@ $1_unittest:
 	$(NINJA) -C $(CMAKE_DIR_DBG) $1_unittest $(NINJAFLAGS)
 	ln -sf $(CMAKE_DIR_DBG)/$1_unittest .
 dbg_$1_unittests: $1_unittest
-	zsh -c 'ulimit -m $(MAX_MEM_KB); time $(GDB) $(GDB_CMDS) --args ./$1_unittest --gtest_break_on_failure $(ARGS)'
+	zsh -c 'ulimit -v $(MAX_MEM_KB); time $(GDB) $(GDB_CMDS) --args ./$1_unittest --gtest_break_on_failure $(ARGS)'
 unittests:: $1_unittest
 run_$1_unittests: $1_unittest
-	zsh -c 'ulimit -m $(MAX_MEM_KB); time ./$1_unittest $(ARGS)'
+	zsh -c 'ulimit -v $(MAX_MEM_KB); time ./$1_unittest $(ARGS)'
 run_unittests:: run_$1_unittests
 )
 endef
@@ -759,23 +759,23 @@ define make_target
 $(eval \
 .PHONY: test$1 check$1
 check$1 test$1: $(PYTHON_EXE_DEPS) pyston$1
-	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-S -k $(TESTS_DIR) $(ARGS)
+	$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-S -k $(TESTS_DIR) $(ARGS)
 	@# we pass -I to cpython tests and skip failing ones because they are sloooow otherwise
-	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-S -k --exit-code-only --skip-failing -t50 $(TEST_DIR)/cpython $(ARGS)
-	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -k -a=-S --exit-code-only --skip-failing -t600 $(TEST_DIR)/integration $(ARGS)
-	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-n -a=-S -t50 -k $(TESTS_DIR) $(ARGS)
-	$(PYTHON) $(TOOLS_DIR)/tester.py -R pyston$1 -j$(TEST_THREADS) -a=-O -a=-S -k $(TESTS_DIR) $(ARGS)
+	$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-S -k --exit-code-only --skip-failing -t50 $(TEST_DIR)/cpython $(ARGS)
+	$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -k -a=-S --exit-code-only --skip-failing -t600 $(TEST_DIR)/integration $(ARGS)
+	$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-n -a=-S -t50 -k $(TESTS_DIR) $(ARGS)
+	$(PYTHON) $(TOOLS_DIR)/tester.py -q -R pyston$1 -j$(TEST_THREADS) -a=-L -a=-S -k $(TESTS_DIR) $(ARGS)
 
 .PHONY: run$1 dbg$1
 run$1: pyston$1 $$(RUN_DEPS)
 	PYTHONPATH=test/test_extension:$${PYTHONPATH} ./pyston$1 $$(ARGS)
 dbg$1: pyston$1 $$(RUN_DEPS)
-	PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -m $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS)'
+	PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -v $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS)'
 nosearch_run$1_%: %.py pyston$1 $$(RUN_DEPS)
-	$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -m $$(MAX_MEM_KB); time ./pyston$1 $$(ARGS) $$<'
+	$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -v $$(MAX_MEM_KB); time ./pyston$1 $$(ARGS) $$<'
 $$(call make_search,run$1_%)
 nosearch_dbg$1_%: %.py pyston$1 $$(RUN_DEPS)
-	$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -m $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS) $$<'
+	$(VERB) PYTHONPATH=test/test_extension:$${PYTHONPATH} zsh -c 'ulimit -v $$(MAX_DBG_MEM_KB); $$(GDB) $$(GDB_CMDS) --args ./pyston$1 $$(ARGS) $$<'
 $$(call make_search,dbg$1_%)
 
 ifneq ($$(ENABLE_VALGRIND),0)
@@ -905,7 +905,7 @@ opreportcg:
 
 .PHONY: watch_% watch wdbg_%
 watch_%:
-	@ ( ulimit -t 60; ulimit -m $(MAK_MEM_KB); \
+	@ ( ulimit -t 60; ulimit -v $(MAK_MEM_KB); \
 		TARGET=$(dir $@)$(patsubst watch_%,%,$(notdir $@)); \
 		clear; $(MAKE) $$TARGET $(WATCH_ARGS); true; \
 		while inotifywait -q -e modify -e attrib -e move -e move_self -e create -e delete -e delete_self \
@@ -921,7 +921,7 @@ wdbg_%:
 	$(MAKE) $(patsubst wdbg_%,watch_dbg_%,$@) GDB_POST_CMDS="--ex quit"
 
 .PHONY: head_%
-HEAD := 40
+HEAD ?= 40
 HEAD_SKIP := 6
 head_%:
 	@ bash -c "set -o pipefail; script -e -q -c '$(MAKE) $(dir $@)$(patsubst head_%,%,$(notdir $@))' /dev/null | tail -n+$(HEAD_SKIP) | head -n$(HEAD)"
@@ -953,7 +953,7 @@ test_cpp_ll:
 .PHONY: bench_exceptions
 bench_exceptions:
 	$(CLANGPP_EXE) $(TEST_DIR)/bench_exceptions.cpp -o bench_exceptions -O3 -std=c++11
-	zsh -c 'ulimit -m $(MAX_MEM_KB); time ./bench_exceptions'
+	zsh -c 'ulimit -v $(MAX_MEM_KB); time ./bench_exceptions'
 	rm bench_exceptions
 
 TEST_EXT_MODULE_NAMES := basic_test descr_test slots_test type_test api_test

from_cpython/CMakeLists.txt

@@ -1,5 +1,12 @@
 # Copy any changed stdlib files to the destination:
 file(GLOB_RECURSE STDLIB_SRCS Lib/*.py)
+
+file(GLOB STDLIB_MORE_SRCS Lib/lib2to3/*.txt)
+set(STDLIB_SRCS ${STDLIB_MORE_SRCS} ${STDLIB_SRCS})
+
+file(GLOB STDLIB_MORE_SRCS Lib/email/test/data/*)
+set(STDLIB_SRCS ${STDLIB_MORE_SRCS} ${STDLIB_SRCS})
+
 file(GLOB_RECURSE STD_INCLUDES Include/*.h)
 set(STDLIB_TARGETS "")
 foreach(STDLIB_FILE ${STDLIB_SRCS})
@@ -181,6 +188,7 @@ add_custom_command(OUTPUT ${STDMODULES}
                    DEPENDS
                        pyston
                        copy_stdlib
+                       setup.py
                        Modules/_multiprocessing/multiprocessing.c
                        Modules/_multiprocessing/semaphore.c
                        Modules/_multiprocessing/socket_connection.c

from_cpython/Lib/_threading_local.py

@@ -15,8 +15,9 @@
   42
 
 You can also access the local-object's dictionary:
+(Pyston change: changed this to dict(mydata.__dict__) to make more portable)
 
-  >>> mydata.__dict__
+  >>> dict(mydata.__dict__)
   {'number': 42}
   >>> mydata.__dict__.setdefault('widgets', [])
   []

from_cpython/Lib/test/bad_coding.py

@@ -1 +1,2 @@
 # -*- coding: uft-8 -*-
+# skip-if: True

from_cpython/Lib/test/bad_coding2.py

@@ -1,2 +1,3 @@
 #coding: utf8
+# skip-if: True
 print '我'

from_cpython/Lib/test/script_helper.py

@@ -7,8 +7,7 @@
 import os.path
 import tempfile
 import subprocess
-# Pyston change: we can't import this currently
-# import py_compile
+import py_compile
 import contextlib
 import shutil
 try:

from_cpython/Lib/test/test_cfgparser.py

@@ -1,4 +1,3 @@
-# expected: fail
 import ConfigParser
 import StringIO
 import os

from_cpython/Lib/test/test_coding.py

@@ -1,5 +1,3 @@
-# expected: fail
-
 import test.test_support, unittest
 import os
 

from_cpython/Lib/test/test_fork1.py

@@ -1,4 +1,3 @@
-# expected: fail
 """This test checks for correct fork() behavior.
 """