diff options
| author | Quentin Glidic <sardemff7+git@sardemff7.net> | 2013-02-21 21:01:23 +0100 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-02-22 08:35:22 -0500 |
| commit | f14977f854bbafe64fc3366dc9027955c1c7c452 (patch) | |
| tree | e3e112a43c5367e84536281f59d07bb4619caced /tests | |
| parent | dda9d78ec9d998647cdda7d35e5adcafe8f2d16e (diff) | |
tests: Use&Fix parallel tests
Also fix automake 1.13 support
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rwxr-xr-x | tests/weston-tests-env | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 0f81458d..27295458 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,11 +11,15 @@ weston_tests = \ text-test \ $(xwayland_test) -TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-tests-env +AM_TESTS_ENVIRONMENT = \ + abs_builddir='$(abs_builddir)'; export abs_builddir; + +LOG_COMPILER = $(srcdir)/weston-tests-env clean-local: -rm -rf logs +# To remove when automake 1.11 support is dropped export abs_builddir noinst_LTLIBRARIES = \ diff --git a/tests/weston-tests-env b/tests/weston-tests-env index 159709eb..2e5fa95b 100755 --- a/tests/weston-tests-env +++ b/tests/weston-tests-env @@ -21,12 +21,14 @@ fi case $1 in *.la|*.so) $WESTON --backend=$BACKEND \ + --socket=test-$(basename $1) \ --modules=$abs_builddir/.libs/${1/.la/.so},xwayland.so \ --log="$SERVERLOG" \ &> "$OUTLOG" ;; *) WESTON_TEST_CLIENT_PATH=$abs_builddir/$1 $WESTON \ + --socket=test-$(basename $1) \ --backend=$BACKEND \ --log="$SERVERLOG" \ --modules=$abs_builddir/.libs/weston-test.so,xwayland.so \ |