claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.lite: Fix running of tests

Browse Source 
* Generate `test/common.sh` from `test/common.sh.in`.
* Move `is_win` setting to `test_common.sh`.
This commit is contained in:
Erik de Castro Lopo
2016-12-21 16:42:15 +11:00
parent 23ca12850c
commit e64ac79798
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/Makefile.lite
View File

@@ -27,6 +27,7 @@ DEFAULT_CONFIG = release
CONFIG = $(DEFAULT_CONFIG) CONFIG = $(DEFAULT_CONFIG)
all: clean all: clean
sed 's|@top_srcdir@|$(topdir)|;s|@EXEEXT@| |' common.sh.in > common.sh
$(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libFLAC.sh $(CONFIG) $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libFLAC.sh $(CONFIG)
$(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libFLAC++.sh $(CONFIG) $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_libFLAC++.sh $(CONFIG)
$(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_grabbag.sh $(CONFIG) $(FLAC__TEST_LEVEL) $(FLAC__TEST_WITH_VALGRIND) ./test_grabbag.sh $(CONFIG)

7
test/common.sh.in
View File

@@ -50,6 +50,13 @@ EXE=@EXEEXT@
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
top_builddir=@top_builddir@ top_builddir=@top_builddir@
# Set `is_win` variable which is used in other scripts that source this one.
if test $(env | grep -ic '^comspec=') != 0 ; then
is_win=yes
else
is_win=no
fi
# change to 'false' to show all flac/metaflac output (useful for debugging) # change to 'false' to show all flac/metaflac output (useful for debugging)
if true ; then if true ; then
SILENT='--silent' SILENT='--silent'

6
test/test_flac.sh
View File

@@ -58,12 +58,6 @@ md5cmp ()
[ "$n" != "" ] && [ $n = 1 ] [ "$n" != "" ] && [ $n = 1 ]
} }
if [ `env | grep -ic '^comspec='` != 0 ] ; then
is_win=yes
else
is_win=no
fi
echo "Checking for --ogg support in flac..." echo "Checking for --ogg support in flac..."
if flac${EXE} --ogg $TOTTALY_SILENT --force-raw-format --endian=little --sign=signed --channels=1 --bps=8 --sample-rate=44100 -c $0 1>/dev/null 2>&1 ; then if flac${EXE} --ogg $TOTTALY_SILENT --force-raw-format --endian=little --sign=signed --channels=1 --bps=8 --sample-rate=44100 -c $0 1>/dev/null 2>&1 ; then
has_ogg=yes; has_ogg=yes;

6
test/test_grabbag.sh
View File

@@ -47,12 +47,6 @@ run_test_picture ()
fi fi
} }
if [ `env | grep -ic '^comspec='` != 0 ] ; then
is_win=yes
else
is_win=no
fi
######################################################################## ########################################################################
# #
# test_picture # test_picture