Move test script to the same directory level as test makefile

Makefile

 all: compile-all
 
 test-parse:
-	@python tests/test.py test-parse
+	@make -C tests/regression test-parse
 
 test-ada:
-	@python tests/test.py test-ada
+	@make -C tests/regression test-ada
 
 test-llvm:
-	@python tests/test.py test-llvm
+	@make -C tests/regression test-llvm
+
+coverage:
+	@make -C tests/regression coverage
 
 flake8:
 	@echo Generating flake8_report file
 	flake8 opengeode.py Pr.py sdlSymbols.py genericSymbols.py ogParser.py AdaGenerator.py Renderer.py Clipboard.py Lander.py ogAST.py undoCommands.py  Connectors.py Asn1scc.py Helper.py Statechart.py >flake8_report
 
-coverage:
-	make -C tests/regression coverage
-
 compile-all:
 	pyside-rcc opengeode.qrc -o icons.py
 	if [ ! -f antlr-3.1.3.tar.bz2 ]; then wget http://download.tuxfamily.org/taste/misc/antlr-3.1.3.tar.bz2 ; tar jxvf antlr-3.1.3.tar.bz2 ; fi

tests/regression/Makefile

 EXAMPLES=$(sort $(dir $(wildcard */)))
 
+test-parse:
+	@python test.py test-parse
+
+test-ada:
+	@python test.py test-ada
+
+test-llvm:
+	@python test.py test-llvm
+
 coverage:
 	for v in $(EXAMPLES) ; do make -C $$v coverage && mv $$v/.coverage* . \
 	|| exit 1 ; done ; coverage combine
@@ -7,4 +16,4 @@ coverage:
 clean:
 	for v in $(EXAMPLES); do make -C $$v clean ; done
 
-.PHONY: coverage clean
+.PHONY: test-parse test-ada test-llvm coverage clean

tests/test.py → tests/regression/test.py

@@ -7,23 +7,23 @@ import time
 tests_folder = os.path.dirname(__file__)
 
 paths = [
-    'regression/test1',
-    'regression/test2',
-    'regression/test3',
-    'regression/test4',
-    'regression/test5',
-    'regression/test6',
-    'regression/test7',
-    'regression/test8',
-    'regression/test9',
-    'regression/test10',
-    'regression/test11',
-    'regression/test12',
-    'regression/test-controlflow',
-    'regression/test-expressions',
-    'regression/test-operators',
-    'regression/test-substrings',
-    'regression/test-exitnested',
+    'test1',
+    'test2',
+    'test3',
+    'test4',
+    'test5',
+    'test6',
+    'test7',
+    'test8',
+    'test9',
+    'test10',
+    'test11',
+    'test12',
+    'test-controlflow',
+    'test-expressions',
+    'test-operators',
+    'test-substrings',
+    'test-exitnested',
 ]