isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Pass unit-tests file to run-tests.sh

Browse Source 
There are different unit-tests file generated containing lists of tests
the test-runner.sh should run. Running run-tests.sh read the unit-tests
in the current directory, which is inconvenient to do when using meson.
This commit is contained in:
Jonas Ådahl 2018-05-22 15:52:37 +02:00
parent 331e830cf6
commit 8894ec462a
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cogl/tests/conform/Makefile.am
View File

@ -135,7 +135,7 @@ test_conformance_LDADD += $(top_builddir)/cogl-path/libmutter-cogl-path-$(LIBMUT
test_conformance_LDFLAGS = -export-dynamic test_conformance_LDFLAGS = -export-dynamic
test: wrappers test: wrappers
@$(top_srcdir)/tests/run-tests.sh $(abs_builddir)/../config.env $(abs_builddir)/test-conformance$(EXEEXT) @$(top_srcdir)/tests/run-tests.sh $(abs_builddir)/../config.env $(abs_builddir)/test-conformance$(EXEEXT) unit-tests
# XXX: we could prevent the conformance test suite from running # XXX: we could prevent the conformance test suite from running
# by simply defining this variable conditionally # by simply defining this variable conditionally
@ -164,7 +164,7 @@ conform.test:
echo " GEN $@"; \ echo " GEN $@"; \
echo "[Test]" > $@.tmp; \ echo "[Test]" > $@.tmp; \
echo "Type=session" >> $@.tmp; \ echo "Type=session" >> $@.tmp; \
echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/mutter-cogl/conform; ../run-tests.sh ../config.env ./test-conformance\"" >> $@.tmp; \ echo "Exec=sh -c \"cd $(libexecdir)/installed-tests/mutter-cogl/conform; ../run-tests.sh ../config.env ./test-conformance unit-tests\"" >> $@.tmp; \
mv $@.tmp $@ mv $@.tmp $@
CLEANFILES = conform.test CLEANFILES = conform.test

10
cogl/tests/run-tests.sh
View File

@ -14,6 +14,9 @@ shift
TEST_BINARY=$1 TEST_BINARY=$1
shift shift
UNIT_TESTS_FILE=$1
shift
. $ENVIRONMENT_CONFIG . $ENVIRONMENT_CONFIG
set +m set +m
@ -98,7 +101,12 @@ fi
echo "" echo ""
echo "" echo ""
for test in `cat unit-tests` if [ ! -f $UNIT_TESTS_FILE ]; then
echo Missing unit-tests file
exit 1
fi
for test in `cat $UNIT_TESTS_FILE`
do do
export COGL_DEBUG= export COGL_DEBUG=

2
cogl/tests/unit/Makefile.am
View File

@ -68,7 +68,7 @@ test_unit_LDFLAGS = -export-dynamic
# XXX: uncomment when tests get fixed # XXX: uncomment when tests get fixed
#test: wrappers #test: wrappers
# @$(top_srcdir)/tests/run-tests.sh $(abs_builddir)/../config.env $(abs_builddir)/test-unit$(EXEEXT) # @$(top_srcdir)/tests/run-tests.sh $(abs_builddir)/../config.env $(abs_builddir)/test-unit$(EXEEXT) unit-tests
# XXX: we could prevent the unit test suite from running # XXX: we could prevent the unit test suite from running
# by simply defining this variable conditionally # by simply defining this variable conditionally