diff --git a/CMakeLists.txt b/CMakeLists.txt index bd4663be76..6d0bd2afb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,22 +29,6 @@ if(NOT NPM_EXECUTABLE) message(FATAL_ERROR "npm is required for many tests") endif() -function(add_geojs_test test_name) - add_test( - NAME "${test_name}" - WORKING_DIRECTORY "${GEOJS_DEPLOY_DIR}" - COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_BINARY_DIR}/test/geojs_test_runner.py - ${ARGN} - ) - set_property(TEST "${test_name}" APPEND PROPERTY DEPENDS "notes-reset") - set_property(TEST "notes-report" APPEND PROPERTY DEPENDS "${test_name}") -endfunction() - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/runners/geojs_test_runner.py.in - ${CMAKE_CURRENT_BINARY_DIR}/test/geojs_test_runner.py -) - # Generate notes to send along with the test reports add_test( NAME "notes-reset" diff --git a/tests/runners/geojs_test_runner.py.in b/tests/runners/geojs_test_runner.py.in deleted file mode 100644 index b61dd86b4a..0000000000 --- a/tests/runners/geojs_test_runner.py.in +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python - -import time -import sys -import os -import subprocess -import threading - -if sys.version_info[0] == 2: - import SocketServer - import SimpleHTTPServer -elif sys.version_info[0] == 3: - import socketserver as SocketServer - from http import server as SimpleHTTPServer -else: - raise Exception("Unsupported python version") - -HTTPHandler = SimpleHTTPServer.SimpleHTTPRequestHandler - - -DEPLOY_PATH = "@GEOJS_DEPLOY_DIR@" -HOST = "@TESTING_HOST@" -PORT = @TESTING_PORT@ -server = None - - -def main(): - status = 0 - if len(sys.argv[1:]): - status = 1 - try: - status = subprocess.call(sys.argv[1:]) - except Exception: - pass - - return status - -if __name__ == "__main__": - sys.exit(main())