run_acats: Treat 'gnatchop' the same way as 'gnatmake'.

	* ada/acats/run_acats: Treat 'gnatchop' the same way
	as 'gnatmake'.  Export GCC_DRIVER.
	* ada/acats/run_all.sh: Add target_gnatchop.  Use
	'host_gnatchop' and 'target_gnatchop' instead of 'gnatshop'.

From-SVN: r75551

2 files changed, 23 insertions, 4 deletions

diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats
index e61191d..24d8785 100755
--- a/gcc/testsuite/ada/acats/run_acats
+++ b/gcc/testsuite/ada/acats/run_acats
@@ -7,6 +7,7 @@ fi
 
 # Set up environment to use the Ada compiler from the object tree
 
+host_gnatchop=`type gnatchop | awk '{print $3}'`
 host_gnatmake=`type gnatmake | awk '{print $3}'`
 ROOT=`${PWDCMD-pwd}`
 BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`
@@ -20,13 +21,27 @@ if [ ! -d $ADA_INCLUDE_PATH ]; then
    exit 1
 fi
 
+if [ ! -f $BASE/gnatchop ]; then
+   echo gnattools missing, exiting.
+   exit 1
+fi
+
 if [ ! -f $BASE/gnatmake ]; then
    echo gnattools missing, exiting.
    exit 1
 fi
 
+GCC_DRIVER="$BASE/xgcc"
 GCC="$BASE/xgcc -B$BASE/"
-export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC
+export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_DRIVER GCC
+
+echo '#!/bin/sh' > host_gnatchop
+echo PATH=`dirname $host_gnatchop`:'$PATH' >> host_gnatchop
+echo unset ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_EXEC_PREFIX >> host_gnatchop
+echo export PATH >> host_gnatchop
+echo exec $host_gnatchop '"$@"' >> host_gnatchop
+
+chmod +x host_gnatchop
 
 echo '#!/bin/sh' > host_gnatmake
 echo PATH=`dirname $host_gnatmake`:'$PATH' >> host_gnatmake
diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh
index f6b1cb4..4d8862c 100755
--- a/gcc/testsuite/ada/acats/run_all.sh
+++ b/gcc/testsuite/ada/acats/run_all.sh
@@ -47,6 +47,10 @@ if [ "$dir" = "$testdir" ]; then
   exit 1
 fi
 
+target_gnatchop () {
+  gnatchop --GCC="$GCC_DRIVER" $*
+}
+
 target_gnatmake () {
   gnatmake --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
 }
@@ -101,7 +105,7 @@ mkdir -p $dir/run
 cp -pr $testdir/tests $dir/
 
 for i in $dir/support/*.ada $dir/support/*.a; do 
-   gnatchop $i >> $dir/acats.log 2>&1
+   host_gnatchop $i >> $dir/acats.log 2>&1
 done
 
 # These tools are used to preprocess some ACATS sources
@@ -139,7 +143,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-gnatchop *.adt >> $dir/acats.log 2>&1
+target_gnatchop *.adt >> $dir/acats.log 2>&1
 
 target_gnatmake -c -gnato -gnatE *.ads > /dev/null 2>&1
 target_gnatmake -c -gnato -gnatE *.adb
@@ -188,7 +192,7 @@ for chapter in $chapters; do
       test=$dir/tests/$chapter/$i
       mkdir $test
       cd $test
-      gnatchop -c -w `ls ${test}*.a ${test}*.ada ${test}*.adt ${test}*.am ${test}*.dep 2> /dev/null` >> $dir/acats.log 2>&1
+      target_gnatchop -c -w `ls ${test}*.a ${test}*.ada ${test}*.adt ${test}*.am ${test}*.dep 2> /dev/null` >> $dir/acats.log 2>&1
       ls ${i}?.adb > ${i}.lst 2> /dev/null
       ls ${i}*m.adb >> ${i}.lst 2> /dev/null
       ls ${i}.adb >> ${i}.lst 2> /dev/null