tests: Use&Fix parallel tests

Also fix automake 1.13 support

Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>

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 =			\

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 \