diff --git a/testsuite/expect/globals b/testsuite/expect/globals.example similarity index 99% rename from testsuite/expect/globals rename to testsuite/expect/globals.example index 52bd308dd8f60c5d0a8512c5d9a301ae95152c14..ba32bebb24dffd168546abacf99dc5612ab6ca77 100755 --- a/testsuite/expect/globals +++ b/testsuite/expect/globals.example @@ -31,8 +31,7 @@ global sacct scancel scontrol sinfo smap squeue srun # Specify the slurm install directory. # Used to locate binaries, libraries, and header files. # -#set slurm_dir "/usr" -set slurm_dir "/home/jette/slurm.way" +set slurm_dir "/usr" set sacct "${slurm_dir}/bin/sacct" set scancel "${slurm_dir}/bin/scancel" set scontrol "${slurm_dir}/bin/scontrol" diff --git a/testsuite/expect/regression b/testsuite/expect/regression index 302d06b5bd7d6787253acf9d56e5d53262093593..dc9ecd8c22b3383a9dc54f408ed9f643ed835db6 100755 --- a/testsuite/expect/regression +++ b/testsuite/expect/regression @@ -35,16 +35,15 @@ COMPLETIONS=0 # Make sure we are in the desired directory before possibly # removing files the user does not want to lose. -wc ./globals >/dev/null 2>/dev/null -rc=$? -if [ $rc -eq 0 ]; then - wc ./regression >/dev/null 2>/dev/null - rc=$? -fi -if [ $rc -ne 0 ]; then +if [ ! -x ./regression ]; then echo "FAILURE: cd to 'testsuite/expect' before starting 'regression'" exit 1 fi +if [ ! -x ./globals ]; then + echo "FAILURE: copy 'globals.example' to 'globals' and modify as needed" + exit 1 +fi + # Remove any recently edited back-up files /bin/rm -f test*.*% test*input test*output test*error