Fix skipping tests when a specific scheduler is requested

tests/cholesky/sched.sh

@@ -17,7 +17,7 @@
 #
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != greedy -a "$STARPU_SCHED" != no-prio -a "$STARPU_SCHED" != dm -a "$STARPU_SCHED" != random ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = greedy -o "$STARPU_SCHED" = no-prio -o "$STARPU_SCHED" = dm -o "$STARPU_SCHED" = random ] || exit 77
 
 maxiter=10
 MAXCPU=3

tests/cholesky/sched_one_gpu.sh

@@ -20,7 +20,7 @@ ROOTDIR=../../
 TIMINGDIR=$PWD/timing/
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != dm -a "$STARPU_SCHED" != greedy ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = dm -o "$STARPU_SCHED" = greedy ] || exit 77
 
 export STARPU_WORKERS_CUDAID="1"
 

tests/datawizard/locality.sh

@@ -20,7 +20,7 @@
 # Test generation of FxT traces
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != modular-eager ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = modular-eager ] || exit 77
 
 set -e
 

tests/heat/dmda.sh

@@ -18,7 +18,7 @@
 maxiter=2
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != dm -a "$STARPU_SCHED" != dmda ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = dm -o "$STARPU_SCHED" = dmda ] || exit 77
 
 calibrate_point()
 {

tests/heat/granularity.sh

@@ -25,7 +25,7 @@ MINSIZE=$((30*1024))
 MAXSIZE=$((31*1024))
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != dm -a "$STARPU_SCHED" != dmda ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = dm -o "$STARPU_SCHED" = dmda ] || exit 77
 
 trace_granularity()
 {

tests/heat/model_perturbation.sh

@@ -21,7 +21,7 @@
 ampllist="1.0 0.5"
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != dm ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = dm ] || exit 77
 
 maxiter=1
 MAXCPU=3

tests/heat/sched.sh

@@ -18,7 +18,7 @@
 maxiter=5
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != greedy -a "$STARPU_SCHED" != dm -a "$STARPU_SCHED" != dmda ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = greedy -o "$STARPU_SCHED" = dm -o "$STARPU_SCHED" = dmda ] || exit 77
 
 calibrate_point()
 {

tests/main/combined_workers/bfs/run.sh

@@ -17,7 +17,7 @@
 # See the GNU Lesser General Public License in COPYING.LGPL for more details.
 #
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != pheft ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = pheft ] || exit 77
 
 #export STARPU_GENERATE_TRACE=1
 #export GOMP_CPU_AFFINITY="0 6 1 7 2 8 3 9 4 10 5 11"

tests/mult/sched.sh

@@ -18,7 +18,7 @@
 maxiter=5
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != random -a "$STARPU_SCHED" != greedy -a "$STARPU_SCHED" != dm ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = random -o "$STARPU_SCHED" = greedy -o "$STARPU_SCHED" = dm ] || exit 77
 
 trace_sched()
 {

tests/overlap/overlap.sh

@@ -20,7 +20,7 @@
 # Test parsing of FxT traces
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != dmdas ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = dmdas ] || exit 77
 
 set -e
 

tests/perf_models/bench_sgemm.sh

@@ -22,7 +22,7 @@ INSTALLDIR=$PWD/local/
 PERFDIR=$DIR/sampling/
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != dm ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = dm ] || exit 77
 
 make -C ../../ distclean
 

tests/perf_models/error_model.sh

@@ -26,7 +26,7 @@ niter=5
 #niter=2
 
 # Testing another specific scheduler, no need to run this
-[ -z "$STARPU_SCHED" -a "$STARPU_SCHED" != dm ] || exit 77
+[ -z "$STARPU_SCHED" -o "$STARPU_SCHED" = dm ] || exit 77
 
 
 rm -f log