FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* 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
This commit is contained in:
Eric Botcazou 2004-01-08 16:19:36 +01:00 • committed by Eric Botcazou
parent 7ddb6568e3
commit 53b8fe3ef6
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,10 @@
2004-01-08 Eric Botcazou <ebotcazou@libertysurf.fr>
* 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'.
2004-01-08 Giovanni Bajo <giovannibajo@gcc.gnu.org>
PR c++/12573

17
gcc/testsuite/ada/acats/run_acats
View file

@ -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

10
gcc/testsuite/ada/acats/run_all.sh
View file

@ -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