scc

simple c99 compiler
git clone git://git.simple-cc.org/scc
Log | Files | Refs | Submodules | README | LICENSE

commit 2bf9c28e042636db833aae0767b984eb8dc1d719
parent 117792ec9773e594fe3831ed96f2a4fb7c87b690
Author: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date:   Tue, 12 Nov 2024 22:30:49 +0100

tests/ar: Use new scc wrapper in the tests

This make easier to use scc-ar from other directories.

Diffstat:
Mtests/ar/execute/0001-append.sh | 6+++---
Mtests/ar/execute/0002-append.sh | 10+++++-----
Mtests/ar/execute/0003-append.sh | 6+++---
Mtests/ar/execute/0004-append.sh | 2+-
Mtests/ar/execute/0005-append.sh | 2+-
Mtests/ar/execute/0006-append.sh | 2+-
Mtests/ar/execute/0007-delete.sh | 4++--
Mtests/ar/execute/0008-delete.sh | 4++--
Mtests/ar/execute/0009-delete.sh | 4++--
Mtests/ar/execute/0010-delete.sh | 6+++---
Mtests/ar/execute/0011-delete.sh | 2+-
Mtests/ar/execute/0012-delete.sh | 22+++++++++++-----------
Mtests/ar/execute/0013-print.sh | 2+-
Mtests/ar/execute/0014-print.sh | 2+-
Mtests/ar/execute/0015-print.sh | 2+-
Mtests/ar/execute/0016-print.sh | 2+-
Mtests/ar/execute/0017-print.sh | 2+-
Mtests/ar/execute/0018-list.sh | 2+-
Mtests/ar/execute/0019-list.sh | 2+-
Mtests/ar/execute/0020-list.sh | 2+-
Mtests/ar/execute/0021-list.sh | 2+-
Mtests/ar/execute/0022-list.sh | 10+++++-----
Mtests/ar/execute/0023-extract.sh | 2+-
Mtests/ar/execute/0024-extract.sh | 2+-
Mtests/ar/execute/0025-extract.sh | 2+-
Mtests/ar/execute/0026-extract.sh | 2+-
Mtests/ar/execute/0027-extract.sh | 2+-
Mtests/ar/execute/0029-move.sh | 4++--
Mtests/ar/execute/0030-move.sh | 4++--
Mtests/ar/execute/0031-move.sh | 4++--
Mtests/ar/execute/0032-update.sh | 4++--
Mtests/ar/execute/0033-update.sh | 4++--
Mtests/ar/execute/0034-update.sh | 6+++---
Mtests/ar/execute/0035-update.sh | 6+++---
Mtests/ar/execute/0036-update.sh | 6+++---
Mtests/ar/execute/0037-update.sh | 6+++---
Mtests/ar/execute/0038-update.sh | 4++--
Mtests/ar/execute/0039-update.sh | 8++++----
Mtests/ar/execute/Makefile | 2+-
39 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/tests/ar/execute/0001-append.sh b/tests/ar/execute/0001-append.sh @@ -15,9 +15,9 @@ echo Second > file2 echo Third > file3 rm -f file.a -$EXEC ${BINDIR}scc-ar -qv file.a file1 file2 file3 +$EXEC scc ar -qv file.a file1 file2 file3 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file1 @@ -27,7 +27,7 @@ EOF cmp $tmp1 $tmp2 -$EXEC ${BINDIR}scc-ar -p file.a > $tmp1 +$EXEC scc ar -p file.a > $tmp1 cat <<EOF > $tmp2 First diff --git a/tests/ar/execute/0002-append.sh b/tests/ar/execute/0002-append.sh @@ -15,10 +15,10 @@ echo Second > file2 echo Third > file3 rm -f file.a -$EXEC ${BINDIR}scc-ar -qv file.a file1 -$EXEC ${BINDIR}scc-ar -qv file.a file2 -$EXEC ${BINDIR}scc-ar -qv file.a file3 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -qv file.a file1 +$EXEC scc ar -qv file.a file2 +$EXEC scc ar -qv file.a file3 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file1 @@ -28,7 +28,7 @@ EOF cmp $tmp1 $tmp2 -$EXEC ${BINDIR}scc-ar -p file.a > $tmp1 +$EXEC scc ar -p file.a > $tmp1 cat <<EOF > $tmp2 First diff --git a/tests/ar/execute/0003-append.sh b/tests/ar/execute/0003-append.sh @@ -15,9 +15,9 @@ echo Second > file-2 echo Third > file-3 cp master.a file.a -$EXEC ${BINDIR}scc-ar -qv file.a file-1 file-2 file-3 +$EXEC scc ar -qv file.a file-1 file-2 file-3 -$EXEC ${BINDIR}scc-ar -t file.a file-1 file-2 file-3 > $tmp1 +$EXEC scc ar -t file.a file-1 file-2 file-3 > $tmp1 cat <<EOF > $tmp2 file-1 @@ -27,7 +27,7 @@ EOF cmp $tmp1 $tmp2 -$EXEC ${BINDIR}scc-ar -p file.a file-1 file-2 file-3 > $tmp1 +$EXEC scc ar -p file.a file-1 file-2 file-3 > $tmp1 cat <<EOF > $tmp2 First diff --git a/tests/ar/execute/0004-append.sh b/tests/ar/execute/0004-append.sh @@ -11,7 +11,7 @@ trap "rm -f file.a f1 f2 f3 $tmp1 $tmp2" 0 2 3 15 #empty file list rm -f file.a -$EXEC ${BINDIR}scc-ar -qv file.a +$EXEC scc ar -qv file.a if ! test -f file.a then echo "ar -q didn't generated empty archive" >&2 diff --git a/tests/ar/execute/0005-append.sh b/tests/ar/execute/0005-append.sh @@ -11,7 +11,7 @@ trap "rm -f file.a f1 f2 f3 $tmp1 $tmp2" 0 2 3 15 #empty file list rm -f file.a -if $EXEC ${BINDIR}scc-ar -qv file.a badfile.a +if $EXEC scc ar -qv file.a badfile.a then echo "ar -q failed to detect missed file" >&2 exit 1 diff --git a/tests/ar/execute/0006-append.sh b/tests/ar/execute/0006-append.sh @@ -11,4 +11,4 @@ trap "rm -f file.a f1 f2 f3 $tmp1 $tmp2" 0 2 3 15 #empty file list rm -f file.a -$EXEC ${BINDIR}scc-ar -qv file.a file.a +$EXEC scc ar -qv file.a file.a diff --git a/tests/ar/execute/0007-delete.sh b/tests/ar/execute/0007-delete.sh @@ -10,9 +10,9 @@ trap "rm -f file.a" 0 2 3 15 cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file2 +$EXEC scc ar -dv file.a file2 -if $EXEC ${BINDIR}scc-ar -tv file.a file2 +if $EXEC scc ar -tv file.a file2 then echo file-2 was not deleted >&2 exit 1 diff --git a/tests/ar/execute/0008-delete.sh b/tests/ar/execute/0008-delete.sh @@ -10,9 +10,9 @@ trap "rm -f file.a" 0 2 3 15 cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file1 file2 +$EXEC scc ar -dv file.a file1 file2 -if $EXEC ${BINDIR}scc-ar -tv file.a file1 file2 +if $EXEC scc ar -tv file.a file1 file2 then echo file-1 or file-2 were not deleted >&2 exit 1 diff --git a/tests/ar/execute/0009-delete.sh b/tests/ar/execute/0009-delete.sh @@ -9,9 +9,9 @@ trap "rm -f file.a" 0 2 3 15 #delete two members, 2nd and 3rd cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file2 file3 +$EXEC scc ar -dv file.a file2 file3 -if $EXEC ${BINDIR}scc-ar -tv file.a file2 file3 +if $EXEC scc ar -tv file.a file2 file3 then echo file-2 file-3 were not deleted >&2 exit 1 diff --git a/tests/ar/execute/0010-delete.sh b/tests/ar/execute/0010-delete.sh @@ -9,15 +9,15 @@ trap "rm -f file.a" 0 2 3 15 #remove all the members cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file1 file2 file3 +$EXEC scc ar -dv file.a file1 file2 file3 -if $EXEC ${BINDIR}scc-ar -tv file.a file2 file3 +if $EXEC scc ar -tv file.a file2 file3 then echo file-1 file2 file were not deleted >&2 exit 1 fi -if test `$EXEC ${BINDIR}scc-ar -t file.a | wc -l` -ne 0 +if test `$EXEC scc ar -t file.a | wc -l` -ne 0 then echo file.a is not empty after deleting all the members >&2 exit 1 diff --git a/tests/ar/execute/0011-delete.sh b/tests/ar/execute/0011-delete.sh @@ -11,7 +11,7 @@ cp master.a file.a last=`ls -l file.a | awk '{print $6,$7,$8}'` -if ! $EXEC ${BINDIR}scc-ar -dv file.a +if ! $EXEC scc ar -dv file.a then echo ar returned with error when no members exit 1 diff --git a/tests/ar/execute/0012-delete.sh b/tests/ar/execute/0012-delete.sh @@ -10,9 +10,9 @@ trap "rm -f file.a" 0 2 3 15 cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file2 +$EXEC scc ar -dv file.a file2 -if $EXEC ${BINDIR}scc-ar -tv file.a file2 +if $EXEC scc ar -tv file.a file2 then echo file-2 was not deleted >&2 exit 1 @@ -24,9 +24,9 @@ fi cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file1 file2 +$EXEC scc ar -dv file.a file1 file2 -if $EXEC ${BINDIR}scc-ar -tv file.a file1 file2 +if $EXEC scc ar -tv file.a file1 file2 then echo file-1 or file-2 were not deleted >&2 exit 1 @@ -37,9 +37,9 @@ fi #delete two members, 2nd and 3rd cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file2 file3 +$EXEC scc ar -dv file.a file2 file3 -if $EXEC ${BINDIR}scc-ar -tv file.a file2 file3 +if $EXEC scc ar -tv file.a file2 file3 then echo file-2 file-3 were not deleted >&2 exit 1 @@ -49,15 +49,15 @@ fi #remove all the members cp master.a file.a -$EXEC ${BINDIR}scc-ar -dv file.a file1 file2 file3 +$EXEC scc ar -dv file.a file1 file2 file3 -if $EXEC ${BINDIR}scc-ar -tv file.a file2 file3 +if $EXEC scc ar -tv file.a file2 file3 then echo file-1 file2 file were not deleted >&2 exit 1 fi -if test `$EXEC ${BINDIR}scc-ar -t file.a | wc -l` -ne 0 +if test `$EXEC scc ar -t file.a | wc -l` -ne 0 then echo file.a is not empty after deleting all the members >&2 exit 1 @@ -71,7 +71,7 @@ cp master.a file.a last=`ls -l file.a | awk '{print $6,$7,$8}'` -if ! $EXEC ${BINDIR}scc-ar -dv file.a +if ! $EXEC scc ar -dv file.a then echo ar returned with error when no members exit 1 @@ -87,7 +87,7 @@ fi #delete not existing member cp master.a file.a -if $EXEC ${BINDIR}scc-ar -dv file.a badfile +if $EXEC scc ar -dv file.a badfile then echo ar returned ok deleting a not existing member >&2 exit 1 diff --git a/tests/ar/execute/0013-print.sh b/tests/ar/execute/0013-print.sh @@ -12,7 +12,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 cp master.a file.a -$EXEC ${BINDIR}scc-ar -p file.a file1 > $tmp1 +$EXEC scc ar -p file.a file1 > $tmp1 cat <<! > $tmp2 This is the first file, diff --git a/tests/ar/execute/0014-print.sh b/tests/ar/execute/0014-print.sh @@ -11,7 +11,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 #print 3rd member cp master.a file.a -$EXEC ${BINDIR}scc-ar -p file.a file3 > $tmp1 +$EXEC scc ar -p file.a file3 > $tmp1 cat <<! > $tmp2 and at the end, this is the last file diff --git a/tests/ar/execute/0015-print.sh b/tests/ar/execute/0015-print.sh @@ -11,7 +11,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 #print 2nd member with verbose cp master.a file.a -$EXEC ${BINDIR}scc-ar -pv file.a file2 >$tmp1 +$EXEC scc ar -pv file.a file2 >$tmp1 cat <<! > $tmp2 diff --git a/tests/ar/execute/0016-print.sh b/tests/ar/execute/0016-print.sh @@ -11,7 +11,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 #print all members cp master.a file.a -$EXEC ${BINDIR}scc-ar -p file.a file1 file2 file3 >$tmp1 +$EXEC scc ar -p file.a file1 file2 file3 >$tmp1 cat <<! > $tmp2 This is the first file, diff --git a/tests/ar/execute/0017-print.sh b/tests/ar/execute/0017-print.sh @@ -10,7 +10,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 #and now with no members in command line cp master.a file.a -$EXEC ${BINDIR}scc-ar -p file.a > $tmp1 +$EXEC scc ar -p file.a > $tmp1 cat <<! > $tmp2 This is the first file, diff --git a/tests/ar/execute/0018-list.sh b/tests/ar/execute/0018-list.sh @@ -12,7 +12,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 cp master.a file.a -$EXEC ${BINDIR}scc-ar -t file.a file1 > $tmp1 +$EXEC scc ar -t file.a file1 > $tmp1 cat <<! > $tmp2 file1 diff --git a/tests/ar/execute/0019-list.sh b/tests/ar/execute/0019-list.sh @@ -11,7 +11,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 #print 3rd member cp master.a file.a -$EXEC ${BINDIR}scc-ar -t file.a file3 > $tmp1 +$EXEC scc ar -t file.a file3 > $tmp1 cat <<! > $tmp2 file3 diff --git a/tests/ar/execute/0020-list.sh b/tests/ar/execute/0020-list.sh @@ -11,7 +11,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 #print 2nd member with verbose cp master.a file.a -$EXEC ${BINDIR}scc-ar -tv file.a file2 >$tmp1 +$EXEC scc ar -tv file.a file2 >$tmp1 cat <<! > $tmp2 rw-r--r-- `id -u`/`id -g` Tue Jan 1 00:00:00 1980 file2 diff --git a/tests/ar/execute/0021-list.sh b/tests/ar/execute/0021-list.sh @@ -11,7 +11,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 #print all members cp master.a file.a -$EXEC ${BINDIR}scc-ar -t file.a file1 file2 file3 >$tmp1 +$EXEC scc ar -t file.a file1 file2 file3 >$tmp1 cat <<! > $tmp2 file1 diff --git a/tests/ar/execute/0022-list.sh b/tests/ar/execute/0022-list.sh @@ -12,7 +12,7 @@ trap "rm -f file.a $tmp1 $tmp2" 0 2 3 15 cp master.a file.a -$EXEC ${BINDIR}scc-ar -t file.a file1 > $tmp1 +$EXEC scc ar -t file.a file1 > $tmp1 cat <<! > $tmp2 file1 @@ -23,7 +23,7 @@ cmp $tmp1 $tmp2 ############################################################################ #print 3rd member -$EXEC ${BINDIR}scc-ar -t file.a file3 > $tmp1 +$EXEC scc ar -t file.a file3 > $tmp1 cat <<! > $tmp2 file3 @@ -34,7 +34,7 @@ cmp $tmp1 $tmp2 ############################################################################ #print 2nd member with verbose -$EXEC ${BINDIR}scc-ar -tv file.a file2 >$tmp1 +$EXEC scc ar -tv file.a file2 >$tmp1 cat <<! > $tmp2 rw-r--r-- `id -u`/`id -g` Tue Jan 1 00:00:00 1980 file2 @@ -45,7 +45,7 @@ cmp $tmp1 $tmp2 ############################################################################ #print all members -$EXEC ${BINDIR}scc-ar -t file.a file1 file2 file3 >$tmp1 +$EXEC scc ar -t file.a file1 file2 file3 >$tmp1 cat <<! > $tmp2 file1 @@ -57,6 +57,6 @@ cmp $tmp1 $tmp2 #and now with no members in command line -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -t file.a > $tmp1 cmp $tmp1 $tmp2 diff --git a/tests/ar/execute/0023-extract.sh b/tests/ar/execute/0023-extract.sh @@ -11,7 +11,7 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #extract 1st member cp master.a file.a -$EXEC ${BINDIR}scc-ar -xv file.a file1 +$EXEC scc ar -xv file.a file1 cat <<EOF > $tmp1 This is the first file, diff --git a/tests/ar/execute/0024-extract.sh b/tests/ar/execute/0024-extract.sh @@ -11,7 +11,7 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #extract 3rd member cp master.a file.a -$EXEC ${BINDIR}scc-ar -xv file.a file3 +$EXEC scc ar -xv file.a file3 cat <<EOF > $tmp1 and at the end, this is the last file diff --git a/tests/ar/execute/0025-extract.sh b/tests/ar/execute/0025-extract.sh @@ -11,7 +11,7 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #extract 3rd member cp master.a file.a -$EXEC ${BINDIR}scc-ar -xv file.a file3 +$EXEC scc ar -xv file.a file3 cat <<EOF > $tmp1 and at the end, this is the last file diff --git a/tests/ar/execute/0026-extract.sh b/tests/ar/execute/0026-extract.sh @@ -11,7 +11,7 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #extract all members cp master.a file.a -$EXEC ${BINDIR}scc-ar -xv file.a file1 file2 file3 +$EXEC scc ar -xv file.a file1 file2 file3 cat <<EOF > $tmp1 This is the first file, diff --git a/tests/ar/execute/0027-extract.sh b/tests/ar/execute/0027-extract.sh @@ -11,7 +11,7 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #extract without parameters cp master.a file.a -$EXEC ${BINDIR}scc-ar -xv file.a +$EXEC scc ar -xv file.a cat <<EOF > $tmp1 This is the first file, diff --git a/tests/ar/execute/0029-move.sh b/tests/ar/execute/0029-move.sh @@ -11,8 +11,8 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #move 1st without specifier cp master.a file.a -$EXEC ${BINDIR}scc-ar -mv file.a file1 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -mv file.a file1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file2 diff --git a/tests/ar/execute/0030-move.sh b/tests/ar/execute/0030-move.sh @@ -11,8 +11,8 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #move 1st at the end cp master.a file.a -$EXEC ${BINDIR}scc-ar -mv -a file3 file.a file1 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -mv -a file3 file.a file1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file2 diff --git a/tests/ar/execute/0031-move.sh b/tests/ar/execute/0031-move.sh @@ -11,8 +11,8 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #and now, test without parameters cp master.a file.a -$EXEC ${BINDIR}scc-ar -mv file.a -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -mv file.a +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file1 diff --git a/tests/ar/execute/0032-update.sh b/tests/ar/execute/0032-update.sh @@ -13,9 +13,9 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 echo First > file1 cp master.a file.a -$EXEC ${BINDIR}scc-ar -rv file.a file1 +$EXEC scc ar -rv file.a file1 -$EXEC ${BINDIR}scc-ar -p file.a file1 > $tmp1 +$EXEC scc ar -p file.a file1 > $tmp1 cat <<EOF > $tmp2 First diff --git a/tests/ar/execute/0033-update.sh b/tests/ar/execute/0033-update.sh @@ -13,9 +13,9 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 echo First > file-1 cp master.a file.a -$EXEC ${BINDIR}scc-ar -rv file.a file-1 +$EXEC scc ar -rv file.a file-1 -$EXEC ${BINDIR}scc-ar -p file.a file-1 > $tmp1 +$EXEC scc ar -p file.a file-1 > $tmp1 cat <<EOF > $tmp2 First diff --git a/tests/ar/execute/0034-update.sh b/tests/ar/execute/0034-update.sh @@ -13,9 +13,9 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 echo First > file1 cp master.a file.a -$EXEC ${BINDIR}scc-ar -rv -a file1 file.a file1 +$EXEC scc ar -rv -a file1 file.a file1 -$EXEC ${BINDIR}scc-ar -p file.a file1 > $tmp1 +$EXEC scc ar -p file.a file1 > $tmp1 cat <<EOF > $tmp2 First @@ -23,7 +23,7 @@ EOF cmp $tmp1 $tmp2 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file1 diff --git a/tests/ar/execute/0035-update.sh b/tests/ar/execute/0035-update.sh @@ -13,9 +13,9 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 echo First > file1 cp master.a file.a -$EXEC ${BINDIR}scc-ar -rv -b file1 file.a file1 +$EXEC scc ar -rv -b file1 file.a file1 -$EXEC ${BINDIR}scc-ar -p file.a file1 > $tmp1 +$EXEC scc ar -p file.a file1 > $tmp1 cat <<EOF > $tmp2 First @@ -23,7 +23,7 @@ EOF cmp $tmp1 $tmp2 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file1 diff --git a/tests/ar/execute/0036-update.sh b/tests/ar/execute/0036-update.sh @@ -13,9 +13,9 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 echo First > file-1 cp master.a file.a -$EXEC ${BINDIR}scc-ar -rv -b file1 file.a file-1 +$EXEC scc ar -rv -b file1 file.a file-1 -$EXEC ${BINDIR}scc-ar -p file.a file-1 > $tmp1 +$EXEC scc ar -p file.a file-1 > $tmp1 cat <<EOF > $tmp2 First @@ -23,7 +23,7 @@ EOF cmp $tmp1 $tmp2 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file-1 diff --git a/tests/ar/execute/0037-update.sh b/tests/ar/execute/0037-update.sh @@ -13,9 +13,9 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 echo First > file-1 cp master.a file.a -$EXEC ${BINDIR}scc-ar -rv -a file1 file.a file-1 +$EXEC scc ar -rv -a file1 file.a file-1 -$EXEC ${BINDIR}scc-ar -p file.a file-1 > $tmp1 +$EXEC scc ar -p file.a file-1 > $tmp1 cat <<EOF > $tmp2 First @@ -23,7 +23,7 @@ EOF cmp $tmp1 $tmp2 -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file1 diff --git a/tests/ar/execute/0038-update.sh b/tests/ar/execute/0038-update.sh @@ -11,9 +11,9 @@ trap "rm -f file* $tmp1 $tmp2" 0 2 3 15 #Update without parameters cp master.a file.a -$EXEC ${BINDIR}scc-ar -rv file.a +$EXEC scc ar -rv file.a -$EXEC ${BINDIR}scc-ar -t file.a > $tmp1 +$EXEC scc ar -t file.a > $tmp1 cat <<EOF > $tmp2 file1 diff --git a/tests/ar/execute/0039-update.sh b/tests/ar/execute/0039-update.sh @@ -15,9 +15,9 @@ echo First > file1 cp master.a file.a sleep 1 touch file1 -$EXEC ${BINDIR}scc-ar -ruv file.a file1 +$EXEC scc ar -ruv file.a file1 -$EXEC ${BINDIR}scc-ar -p file.a file1 > $tmp1 +$EXEC scc ar -p file.a file1 > $tmp1 cat <<EOF > $tmp2 First @@ -27,9 +27,9 @@ cmp $tmp1 $tmp2 echo Second > file1 touch -t 197001010000 file.1 -$EXEC ${BINDIR}scc-ar -ruv file.a file1 +$EXEC scc ar -ruv file.a file1 -$EXEC ${BINDIR}scc-ar -p file.a file1 > $tmp1 +$EXEC scc ar -p file.a file1 > $tmp1 cat <<EOF > $tmp2 First diff --git a/tests/ar/execute/Makefile b/tests/ar/execute/Makefile @@ -3,7 +3,7 @@ BINDIR = ../../../bin/ all: master.a - BINDIR=$(BINDIR) ./chktest.sh + PATH=$(BINDIR):$$PATH ./chktest.sh master.a: mkmaster.sh @./mkmaster.sh