isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Allow to run the tests from any directory

Browse Source 
I was fed up to cd into the tests/conform or tests/interactive directories
to launch a specific test. Now, with the power the abs_ variants of
builddir and srcdir we can run specific test from any directory.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2159
This commit is contained in:
Damien Lespiau 2010-06-06 22:47:02 +01:00 committed by Robert Bragg
parent 739240095f
commit 1860d45087
7 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1029,8 +1029,10 @@ AC_CONFIG_FILES([
clutter/json/Makefile clutter/json/Makefile
tests/Makefile tests/Makefile
tests/conform/Makefile tests/conform/Makefile
tests/conform/test-launcher.sh
tests/data/Makefile tests/data/Makefile
tests/interactive/Makefile tests/interactive/Makefile
tests/interactive/wrapper.sh
tests/micro-bench/Makefile tests/micro-bench/Makefile
tests/tools/Makefile tests/tools/Makefile
doc/Makefile doc/Makefile

1
tests/conform/.gitignore vendored
View File

@ -1,4 +1,5 @@
*.o *.o
/test-launcher.sh
/stamp-test-conformance /stamp-test-conformance
/test-anchors /test-anchors
/test-cogl-backface-culling /test-cogl-backface-culling

6
tests/conform/Makefile.am
View File

@ -67,11 +67,12 @@ wrappers: stamp-test-conformance
@true @true
stamp-test-conformance: test-conformance$(EXEEXT) stamp-test-conformance: test-conformance$(EXEEXT)
@mkdir -p wrappers @mkdir -p wrappers
@chmod +x test-launcher.sh
@for i in $(UNIT_TESTS); \ @for i in $(UNIT_TESTS); \
do \ do \
unit=`basename $$i | sed -e s/_/-/g`; \ unit=`basename $$i | sed -e s/_/-/g`; \
echo " GEN $$unit"; \ echo " GEN $$unit"; \
( echo "#!/bin/sh" ; echo "$(top_srcdir)/tests/conform/test-launcher.sh '$$i' \"\$$@\"" ) > $$unit$(EXEEXT) ; \ ( echo "#!/bin/sh" ; echo "$(abs_builddir)/test-launcher.sh '$$i' \"\$$@\"" ) > $$unit$(EXEEXT) ; \
( echo "#!/bin/sh" ; echo "exec ./test-conformance$(EXEEXT) -p $$i \"\$$@\"" ) > wrappers/$$unit$(EXEEXT) ; \ ( echo "#!/bin/sh" ; echo "exec ./test-conformance$(EXEEXT) -p $$i \"\$$@\"" ) > wrappers/$$unit$(EXEEXT) ; \
chmod +x $$unit$(EXEEXT); \ chmod +x $$unit$(EXEEXT); \
chmod +x wrappers/$$unit$(EXEEXT); \ chmod +x wrappers/$$unit$(EXEEXT); \
@ -177,7 +178,8 @@ full-report: full-report-generate
gnome-open "$$x"; \ gnome-open "$$x"; \
done done
EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh run-tests.sh EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh.in run-tests.sh
DISTCLEANFILES = test-launcher.sh
# we override the clean-generic target to clean up the wrappers so # we override the clean-generic target to clean up the wrappers so
# we cannot use CLEANFILES # we cannot use CLEANFILES

2
tests/conform/test-launcher.sh → tests/conform/test-launcher.sh.in
View File

@ -12,7 +12,7 @@ UNIT_TEST=`basename ${UNIT_TEST_PATH}`
echo "Running: ./test-conformance -p ${UNIT_TEST_PATH} $@" echo "Running: ./test-conformance -p ${UNIT_TEST_PATH} $@"
echo "" echo ""
./test-conformance -p ${UNIT_TEST_PATH} "$@" @abs_builddir@/test-conformance -p ${UNIT_TEST_PATH} "$@"
echo "" echo ""
echo "NOTE: For debugging purposes, you can run this single test as follows:" echo "NOTE: For debugging purposes, you can run this single test as follows:"

1
tests/interactive/.gitignore vendored
View File

@ -1,4 +1,5 @@
*.o *.o
/wrapper.sh
/stamp-test-interactive /stamp-test-interactive
/test-actor-clone /test-actor-clone
/test-actors /test-actors

8
tests/interactive/Makefile.am
View File

@ -65,7 +65,8 @@ endif
wrappers: stamp-test-interactive wrappers: stamp-test-interactive
@true @true
stamp-test-interactive: test-interactive$(EXEEXT) stamp-test-interactive: test-interactive$(EXEEXT)
@wrapper=$(top_srcdir)/tests/interactive/wrapper.sh ; \ @wrapper=$(abs_builddir)/wrapper.sh ; \
chmod +x $$wrapper && \
for i in $(UNIT_TESTS); \ for i in $(UNIT_TESTS); \
do \ do \
test_bin=$${i%*.c} ; \ test_bin=$${i%*.c} ; \
@ -102,12 +103,13 @@ noinst_PROGRAMS = test-interactive
test_interactive_SOURCES = test-main.c $(UNIT_TESTS) test_interactive_SOURCES = test-main.c $(UNIT_TESTS)
test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
test_interactive_CPPFLAGS = \ test_interactive_CPPFLAGS = \
-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
-DG_DISABLE_SINGLE_INCLUDES -DG_DISABLE_SINGLE_INCLUDES
test_interactive_LDFLAGS = -export-dynamic test_interactive_LDFLAGS = -export-dynamic
test_interactive_LDADD = $(CLUTTER_LIBS) $(common_ldadd) test_interactive_LDADD = $(CLUTTER_LIBS) $(common_ldadd)
EXTRA_DIST = wrapper.sh EXTRA_DIST = wrapper.sh.in
DISTCLEANFILES = wrapper.sh
BUILT_SOURCES = wrappers BUILT_SOURCES = wrappers

2
tests/interactive/wrapper.sh → tests/interactive/wrapper.sh.in
View File

@ -11,5 +11,5 @@ echo "$ libtool --mode=execute \\"
echo " gdb --eval-command=\"b `echo $UNIT_TEST|tr '-' '_'`_main\" \\" echo " gdb --eval-command=\"b `echo $UNIT_TEST|tr '-' '_'`_main\" \\"
echo " --args ./test-interactive $UNIT_TEST" echo " --args ./test-interactive $UNIT_TEST"
./test-interactive $UNIT_TEST "$@" @abs_builddir@/test-interactive $UNIT_TEST "$@"