Commit e64ac797 authored by Erik de Castro Lopo's avatar Erik de Castro Lopo

Makefile.lite: Fix running of tests

* Generate `test/common.sh` from `test/common.sh.in`.
* Move `is_win` setting to `test_common.sh`.
parent 23ca1285
......@@ -27,6 +27,7 @@ DEFAULT_CONFIG = release
CONFIG = $(DEFAULT_CONFIG)
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_grabbag.sh $(CONFIG)
......
......@@ -50,6 +50,13 @@ EXE=@EXEEXT@
top_srcdir=@top_srcdir@
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)
if true ; then
SILENT='--silent'
......
......@@ -58,12 +58,6 @@ md5cmp ()
[ "$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..."
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;
......
......@@ -47,12 +47,6 @@ run_test_picture ()
fi
}
if [ `env | grep -ic '^comspec='` != 0 ] ; then
is_win=yes
else
is_win=no
fi
########################################################################
#
# test_picture
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment