Merge commit 'upstream/4.6.1'

[debian/atlc] / tests / 5a-check-s_and_-S_options_of_atlc-2conductor.test

diff --git a/tests/5a-check-s_and_-S_options_of_atlc-2conductor.test b/tests/5a-check-s_and_-S_options_of_atlc-2conductor.test
index fc16511217e4c46df9050db6addce05372b96224..30ae4cd218407aa3e917e4c793450477b24b117f 100755 (executable)
--- a/tests/5a-check-s_and_-S_options_of_atlc-2conductor.test
+++ b/tests/5a-check-s_and_-S_options_of_atlc-2conductor.test
@@ -11,9 +11,9 @@ cp $top_srcdir/examples/coax2.bmp $top_builddir/tmp
 
 # Check the -S and -s options together prevent all ( .bmp or .bin files ) being created. 
 if [ "$mpirun_found" = "yes" ] ; then
-  mpirun -np 2 $top_builddir/src/non_gui/atlc -s -S $top_builddir/tmp/coax2.bmp > /dev/null
+  mpirun -np 2 $top_builddir/src/atlc -s -S $top_builddir/tmp/coax2.bmp > /dev/null
 else
-  $top_builddir/src/non_gui/atlc -s -S $top_builddir/tmp/coax2.bmp > /dev/null
+  $top_builddir/src/atlc -s -S $top_builddir/tmp/coax2.bmp > /dev/null
 fi
 
 if [ -f $top_builddir/tmp/coax2.Ex.bmp ]  || [ -f $top_builddir/tmp/coax2.Ey.bin ] || [ -f top_builddir/tmp/coax2.Er.bin ] ; then
@@ -26,9 +26,9 @@ fi
 
 # Check that -S suppresses the creation of .bin, but not .bmp's
 if [ "$mpirun_found" = "yes" ] ; then
-  npirun -np 2$top_builddir/src/non_gui/atlc -S $top_builddir/tmp/coax2.bmp > /dev/null
+  npirun -np 2$top_builddir/src/atlc -S $top_builddir/tmp/coax2.bmp > /dev/null
 else
-  $top_builddir/src/non_gui/atlc -S $top_builddir/tmp/coax2.bmp > /dev/null
+  $top_builddir/src/atlc -S $top_builddir/tmp/coax2.bmp > /dev/null
 fi
 
 if [ -f $top_builddir/tmp/coax2.Ex.bin ]  || [ -f $top_builddir/tmp/coax2.Ey.bin ] || [ -f $top_builddir/tmp/coax2.Er.bin ] || [ ! -f  $top_builddir/tmp/coax2.Er.bmp ] ; then
@@ -54,9 +54,9 @@ rm  -f $top_builddir/tmp/coax2.Er.bin
 
 # Check that -s suppresses the creation of .bmp's, but not .bin's
 if [ "$mpirun_found" = "yes" ] ; then
-  mpirun -np 2 $top_builddir/src/non_gui/atlc -s $top_builddir/tmp/coax2.bmp > /dev/null
+  mpirun -np 2 $top_builddir/src/atlc -s $top_builddir/tmp/coax2.bmp > /dev/null
 else
-  $top_builddir/src/non_gui/atlc -s $top_builddir/tmp/coax2.bmp > /dev/null
+  $top_builddir/src/atlc -s $top_builddir/tmp/coax2.bmp > /dev/null
 fi
 
 if [ -f $top_builddir/tmp/coax2.Ex.bmp ]  || [ -f $top_builddir/tmp/coax2.Ey.bmp ] || [ ! -f $top_builddir/tmp/coax2.Er.bin ]  ; then
@@ -80,9 +80,9 @@ rm  -f $top_builddir/tmp/coax2.Er.bin
 
 # Check that no options creates.bmp's and  bin's
 if [ "$mpirun_found" = "yes" ] ; then
-  $top_builddir/src/non_gui/atlc $top_builddir/tmp/coax2.bmp > /dev/null
+  $top_builddir/src/atlc $top_builddir/tmp/coax2.bmp > /dev/null
 else
-  $top_builddir/src/non_gui/atlc $top_builddir/tmp/coax2.bmp > /dev/null
+  $top_builddir/src/atlc $top_builddir/tmp/coax2.bmp > /dev/null
 fi
 
 if [ ! -f $top_builddir/tmp/coax2.Ex.bmp ]  || [ ! -f $top_builddir/tmp/coax2.Ey.bmp ] || [ ! -f $top_builddir/tmp/coax2.Er.bin ]  ; then