diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-05-23 17:48:49 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-07-16 16:59:57 +0200 |
| commit | 7c4a957606f5a5b2afc8078228f228c8f87ccce5 (patch) | |
| tree | fee1d7de15012b7895898d0414a676aa6d44e5b3 /build-aux | |
| parent | 6f8012cfde25c3ecb07a18f25fbf39e6ae8d4c9b (diff) | |
| download | vala-7c4a957606f5a5b2afc8078228f228c8f87ccce5.tar.gz | |
testrunner: Allow checking generated C sources
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/testrunner.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/build-aux/testrunner.sh b/build-aux/testrunner.sh index a756d0025..967a06238 100755 --- a/build-aux/testrunner.sh +++ b/build-aux/testrunner.sh @@ -43,6 +43,7 @@ VALAC=$abs_top_builddir/compiler/valac$EXEEXT VALAFLAGS="$VALAFLAGS \ --vapidir $vapidir \ --enable-checking \ + --disable-version-header \ --disable-warnings \ --save-temps \ --cc $CC \ @@ -156,8 +157,20 @@ function sourceend() { PACKAGEFLAGS=$([ -z "$PACKAGES" ] || echo $PACKAGES | xargs -n 1 echo -n " --pkg") echo "$VALAC $VALAFLAGS $PACKAGEFLAGS -o $ns$EXEEXT $SOURCEFILE" >> prepare if [ $DBUSTEST -eq 1 ]; then + echo "UPDATE_EXPECTED=$UPDATE_EXPECTED" >> prepare if [ $ISSERVER -eq 1 ]; then + echo "if [ -n \"$UPDATE_EXPECTED\" ]; then" >> prepare + echo " cp -p ${SOURCEFILE%.*}.c $abs_srcdir/${testfile%.*}_server.c-expected" >> prepare + echo "elif [ -f $abs_srcdir/${testfile%.*}_server.c-expected ]; then" >> prepare + echo " diff -wu $abs_srcdir/${testfile%.*}_server.c-expected ${SOURCEFILE%.*}.c || exit 1" >> prepare + echo "fi" >> prepare echo "./$ns$EXEEXT" >> check + else + echo "if [ -n \"$UPDATE_EXPECTED\" ]; then" >> prepare + echo " cp -p ${SOURCEFILE%.*}.c $abs_srcdir/${testfile%.*}_client.c-expected" >> prepare + echo "elif [ -f $abs_srcdir/${testfile%.*}_client.c-expected ]; then" >> prepare + echo " diff -wu $abs_srcdir/${testfile%.*}_client.c-expected ${SOURCEFILE%.*}.c || exit 1" >> prepare + echo "fi" >> prepare fi else echo "./$ns$EXEEXT" >> check @@ -183,6 +196,11 @@ case "$testfile" in cat "$abs_srcdir/$testfile" > ./$SOURCEFILE PACKAGEFLAGS=$([ -z "$PACKAGES" ] || echo $PACKAGES | xargs -n 1 echo -n " --pkg") $VALAC $VALAFLAGS $PACKAGEFLAGS -o $testpath$EXEEXT $SOURCEFILE + if [ -n "$UPDATE_EXPECTED" ]; then + cp -p ${SOURCEFILE%.*}.c $abs_srcdir/${testfile%.*}.c-expected + elif [ -f $abs_srcdir/${testfile%.*}.c-expected ]; then + diff -wu $abs_srcdir/${testfile%.*}.c-expected ${SOURCEFILE%.*}.c || exit 1 + fi ./$testpath$EXEEXT ;; *.test) |