run_all.sh: Make sure norun.lst is sorted using the current collation.

* ada/acats/run_all.sh: Make sure norun.lst is sorted using the
	current collation.

	Backport from mainline:
	2009-12-17  Arnaud Charlet  <charlet@adacore.com>

	* ada/acats/run_all.sh: Strip comments from norun.lst.

From-SVN: r156256
This commit is contained in:
Jakub Jelinek 2010-01-26 18:25:40 +01:00 committed by Jakub Jelinek
parent 2a4ce597f1
commit ca2d2b777f
2 changed files with 12 additions and 1 deletions

View File

@ -1,3 +1,13 @@
2010-01-26 Jakub Jelinek <jakub@redhat.com>
* ada/acats/run_all.sh: Make sure norun.lst is sorted using the
current collation.
Backport from mainline:
2009-12-17 Arnaud Charlet <charlet@adacore.com>
* ada/acats/run_all.sh: Strip comments from norun.lst.
2010-01-25 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
Backport from mainline.

View File

@ -129,6 +129,7 @@ sed -e "s,ACATS4GNATDIR,$dir,g" \
cp $testdir/tests/cd/*.c $dir/support
cp $testdir/tests/cxb/*.c $dir/support
grep -v '^#' $testdir/norun.lst | sort > $dir/support/norun.lst
rm -rf $dir/run
mv $dir/tests $dir/tests.$$ 2> /dev/null
@ -206,7 +207,7 @@ for chapter in $chapters; do
cd $dir/tests/$chapter
ls *.a *.ada *.adt *.am *.dep 2> /dev/null | sed -e 's/\(.*\)\..*/\1/g' | \
cut -c1-7 | sort | uniq | comm -23 - $testdir/norun.lst \
cut -c1-7 | sort | uniq | comm -23 - $dir/support/norun.lst \
> $dir/tests/$chapter/${chapter}.lst
countn=`wc -l < $dir/tests/$chapter/${chapter}.lst`
glob_countn=`expr $glob_countn + $countn`