diff --git a/testsuite/Makefile b/testsuite/Makefile index 67c81b36..087fe530 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -1,4 +1,12 @@ -testsuite: ../src/parallel tests-to-run/* wanted-results/* startdb +testsuite: ../src/parallel tests-to-run/* wanted-results/* startdb prereq + time sh Start.sh + date + +local: ../src/parallel tests-to-run/*local* wanted-results/*local* startdb prereq + time sh Start.sh local + date + +prereq: installparallel echo | mop || (echo mop is required for testsuite; /bin/false) seq 1 2 | mop || (echo seq is required for testsuite; /bin/false) stdout echo || (echo stdout is required for testsuite; /bin/false) @@ -14,8 +22,9 @@ testsuite: ../src/parallel tests-to-run/* wanted-results/* startdb which burnP6 || (echo burnP6 is required for testsuite; /bin/false) which timeout || (echo timeout is required for testsuite; /bin/false) parallel ssh parallel@parallel-server{} parallel --minversion 20100101 ::: 1 2 3 || (echo parallel on remote required for testsuite; /bin/true) - time sh Start.sh - date + +installparallel: ../src/parallel + cd .. && make -j && sudo make -j install startdb: sudo parallel /etc/init.d/{} start ::: postgresql mysql oracle-xe diff --git a/testsuite/Start.sh b/testsuite/Start.sh index 5eff968a..7876ba2b 100644 --- a/testsuite/Start.sh +++ b/testsuite/Start.sh @@ -3,7 +3,7 @@ export LANG=C SHFILE=/tmp/unittest-parallel.sh -ls -t tests-to-run/*.sh \ +ls -t tests-to-run/*${1}*.sh \ | perl -pe 's:(.*/(.*)).sh:bash $1.sh > actual-results/$2; diff -Naur wanted-results/$2 actual-results/$2:' \ >$SHFILE diff --git a/testsuite/tests-to-run/parallel-local103.sh b/testsuite/tests-to-run/parallel-local103.sh deleted file mode 100755 index 129cc38b..00000000 --- a/testsuite/tests-to-run/parallel-local103.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test15 \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local106.sh b/testsuite/tests-to-run/parallel-local106.sh deleted file mode 100755 index 9ad27401..00000000 --- a/testsuite/tests-to-run/parallel-local106.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test15 diff --git a/testsuite/tests-to-run/parallel-local107.sh b/testsuite/tests-to-run/parallel-local107.sh deleted file mode 100755 index 129cc38b..00000000 --- a/testsuite/tests-to-run/parallel-local107.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test15 \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local111.sh b/testsuite/tests-to-run/parallel-local111.sh deleted file mode 100755 index 9ad27401..00000000 --- a/testsuite/tests-to-run/parallel-local111.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test15 diff --git a/testsuite/tests-to-run/parallel-local122.sh b/testsuite/tests-to-run/parallel-local122.sh deleted file mode 100755 index 05a7907c..00000000 --- a/testsuite/tests-to-run/parallel-local122.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash - diff --git a/testsuite/tests-to-run/parallel-local144.sh b/testsuite/tests-to-run/parallel-local144.sh deleted file mode 100644 index 3a6b6da0..00000000 --- a/testsuite/tests-to-run/parallel-local144.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Moved to test15.sh - diff --git a/testsuite/tests-to-run/parallel-local148.sh b/testsuite/tests-to-run/parallel-local148.sh deleted file mode 100644 index aa6decb8..00000000 --- a/testsuite/tests-to-run/parallel-local148.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test15.sh diff --git a/testsuite/tests-to-run/parallel-local153.sh b/testsuite/tests-to-run/parallel-local153.sh deleted file mode 100644 index 9ad27401..00000000 --- a/testsuite/tests-to-run/parallel-local153.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test15 diff --git a/testsuite/tests-to-run/parallel-local155.sh b/testsuite/tests-to-run/parallel-local155.sh deleted file mode 100644 index 05a7907c..00000000 --- a/testsuite/tests-to-run/parallel-local155.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash - diff --git a/testsuite/tests-to-run/parallel-local156.sh b/testsuite/tests-to-run/parallel-local156.sh deleted file mode 100644 index 11fafb56..00000000 --- a/testsuite/tests-to-run/parallel-local156.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test12 diff --git a/testsuite/tests-to-run/parallel-local163.sh b/testsuite/tests-to-run/parallel-local163.sh deleted file mode 100644 index 9ad27401..00000000 --- a/testsuite/tests-to-run/parallel-local163.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -# Moved to test15 diff --git a/testsuite/tests-to-run/parallel-local17.sh b/testsuite/tests-to-run/parallel-local17.sh deleted file mode 100755 index 05a7907c..00000000 --- a/testsuite/tests-to-run/parallel-local17.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash - diff --git a/testsuite/tests-to-run/parallel-local18.sh b/testsuite/tests-to-run/parallel-local18.sh deleted file mode 100644 index 947a80fd..00000000 --- a/testsuite/tests-to-run/parallel-local18.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -x - diff --git a/testsuite/wanted-results/parallel-local103 b/testsuite/wanted-results/parallel-local103 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local106 b/testsuite/wanted-results/parallel-local106 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local107 b/testsuite/wanted-results/parallel-local107 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local111 b/testsuite/wanted-results/parallel-local111 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local122 b/testsuite/wanted-results/parallel-local122 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local144 b/testsuite/wanted-results/parallel-local144 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local148 b/testsuite/wanted-results/parallel-local148 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local153 b/testsuite/wanted-results/parallel-local153 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local155 b/testsuite/wanted-results/parallel-local155 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local156 b/testsuite/wanted-results/parallel-local156 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local163 b/testsuite/wanted-results/parallel-local163 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local17 b/testsuite/wanted-results/parallel-local17 deleted file mode 100644 index e69de29b..00000000 diff --git a/testsuite/wanted-results/parallel-local18 b/testsuite/wanted-results/parallel-local18 deleted file mode 100644 index e69de29b..00000000