diff options
| author | Lev Walkin <vlm@lionet.info> | 2004-10-20 15:40:04 +0000 |
|---|---|---|
| committer | Lev Walkin <vlm@lionet.info> | 2004-10-20 15:40:04 +0000 |
| commit | a460ba3f017126dc2c02fb639b6b0ecb00bf1be5 (patch) | |
| tree | 8fbc7e15e200555288cca5b2c276fda8e6414e2e /asn1c | |
| parent | cc11653d60dcb8424fd78ae94583e5b09c129648 (diff) | |
things necessary for Sun Solaris 9 @ sparc
Diffstat (limited to 'asn1c')
| -rwxr-xr-x | asn1c/check-parsing.sh | 4 | ||||
| -rw-r--r-- | asn1c/tests/Makefile.am | 2 | ||||
| -rw-r--r-- | asn1c/tests/Makefile.in | 2 | ||||
| -rwxr-xr-x | asn1c/tests/check-assembly.sh | 11 |
4 files changed, 12 insertions, 7 deletions
diff --git a/asn1c/check-parsing.sh b/asn1c/check-parsing.sh index c5c2d6aa..5480d0b9 100755 --- a/asn1c/check-parsing.sh +++ b/asn1c/check-parsing.sh @@ -2,6 +2,8 @@ tmpfile=".check-parsing.$$.tmp" +diff -a . . 2>/dev/null && diffArgs="-a" + ec=0 for ref in ../tests/*.asn1.-*; do @@ -10,7 +12,7 @@ for ref in ../tests/*.asn1.-*; do echo "Checking $src against $ref" ./asn1c "-$flags" "$src" > "$tmpfile" || ec=$? if [ $? = 0 ]; then - diff -a -u "$ref" "$tmpfile" || ec=$? + diff $diffArgs -u "$ref" "$tmpfile" || ec=$? fi if [ "$1" != "regenerate" ]; then rm -f "$tmpfile" diff --git a/asn1c/tests/Makefile.am b/asn1c/tests/Makefile.am index 4a4b461e..a6ab54a3 100644 --- a/asn1c/tests/Makefile.am +++ b/asn1c/tests/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = @ADD_CFLAGS@ check_SCRIPTS = check-assembly.sh -TESTS_ENVIRONMENT= CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh +TESTS_ENVIRONMENT= CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh if CPLUSPLUS_FOUND TESTS = check-*.c check-*.cc ## Include C++ test filed (.cc) diff --git a/asn1c/tests/Makefile.in b/asn1c/tests/Makefile.in index 91ad426e..80dcd2af 100644 --- a/asn1c/tests/Makefile.in +++ b/asn1c/tests/Makefile.in @@ -157,7 +157,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ AM_CFLAGS = @ADD_CFLAGS@ check_SCRIPTS = check-assembly.sh -TESTS_ENVIRONMENT = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh +TESTS_ENVIRONMENT = CC="${CC}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" ./check-assembly.sh @CPLUSPLUS_FOUND_FALSE@TESTS = check-*.c @CPLUSPLUS_FOUND_TRUE@TESTS = check-*.c check-*.cc ## Include C++ test filed (.cc) EXTRA_DIST = \ diff --git a/asn1c/tests/check-assembly.sh b/asn1c/tests/check-assembly.sh index 43ce0012..2edc8f4f 100755 --- a/asn1c/tests/check-assembly.sh +++ b/asn1c/tests/check-assembly.sh @@ -11,10 +11,10 @@ if [ "x$1" = "x" ]; then fi # Compute the .asn1 spec name by the given file name. -source=$(echo "$1" | sed -e 's/.*\///') +source=`echo "$1" | sed -e 's/.*\///'` testno=`echo "$source" | cut -f2 -d'-' | cut -f1 -d'.'` -args=$(echo "$source" | sed -e 's/\.c[c]*$//') +args=`echo "$source" | sed -e 's/\.c[c]*$//'` testdir=test-${args} OFS=$IFS @@ -30,9 +30,10 @@ if [ ! -d $testdir ]; then mkdir $testdir || exit $? fi cd $testdir || exit $? -ln -fs ../$source || exit $? +rm -f ./$source 2>/dev/null +ln -fns ../$source || exit $? -asn_module=$(echo ../../../tests/${testno}-*.asn1) +asn_module=`echo ../../../tests/${testno}-*.asn1` # Create a Makefile for the project. cat > Makefile <<EOM @@ -42,6 +43,8 @@ COMMON_FLAGS= -I. -DEMIT_ASN_DEBUG CFLAGS=\${COMMON_FLAGS} ${CFLAGS} CXXFLAGS=\${COMMON_FLAGS} ${CXXFLAGS} +CC=${CC} + all: check-executable check-executable: compiled-module *.c* @rm -f *.core |