about summary refs log tree commit diff
path: root/test/pamshuffle.test
diff options
context:
space:
mode:
Diffstat (limited to 'test/pamshuffle.test')
-rwxr-xr-xtest/pamshuffle.test22
1 files changed, 4 insertions, 18 deletions
diff --git a/test/pamshuffle.test b/test/pamshuffle.test
index 700631cb..371b65a5 100755
--- a/test/pamshuffle.test
+++ b/test/pamshuffle.test
@@ -46,22 +46,8 @@ rm ${out1_pam}
 test_out=${tmpdir}/test_out
 echo "Test Invalid."
 
-echo 1>&2
-echo "Invalid command-line argument combinations." 1>&2
-echo "Error messages should appear below the line." 1>&2
-echo "-----------------------------------------------------------" 1>&2
+. ${srcdir}/test-invalid.inc
 
-pamshuffle testimg.ppm testgrid.pbm > ${test_out} || \
-  printf "Expected failure 1 "
-  test -s ${test_out} && echo "unexpected output" || echo "(no output)"
-  rm -f ${test_out}
-
-pamshuffle -randomseed -column testgrid.pbm > ${test_out} || \
-  printf "Expected failure 2 "
-  test -s ${test_out} && echo "unexpected output" || echo "(no output)"
-  rm -f ${test_out}
-
-pamshuffle -randomseed=null testgrid.pbm > ${test_out} || \
-  printf "Expected failure 3 "
-  test -s ${test_out} && echo "unexpected output" || echo "(no output)"
-  rm -f ${test_out}
+invCmd "pamshuffle testimg.ppm testgrid.pbm"
+invCmd "pamshuffle -randomseed -column testgrid.pbm"
+invCmd "pamshuffle -randomseed=null testgrid.pbm"