diff options
| author | Jon A. Cruz <jonc@osg.samsung.com> | 2015-12-21 13:38:51 -0800 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2016-02-23 16:08:13 +0200 |
| commit | c25f72d8e95afde8f6f59cbc33ef314fd42a3ac4 (patch) | |
| tree | bf337978a6ef6e0456d70e20e67961dc6fc08572 /tests | |
| parent | 35552aafc78405cf90d6895edfe51e5e859363da (diff) | |
| download | weston-c25f72d8e95afde8f6f59cbc33ef314fd42a3ac4.tar.gz | |
tests: cleanup test runner script.
Cleaned up test runner script to unify sections launching weston.
This makes the sections more legible and differences easier to spot.
Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/weston-tests-env | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/weston-tests-env b/tests/weston-tests-env index 0b9ff1e3..ab2d6c0c 100755 --- a/tests/weston-tests-env +++ b/tests/weston-tests-env @@ -55,11 +55,11 @@ case $TEST_FILE in WESTON_BUILD_DIR=$abs_builddir \ WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \ $WESTON --backend=$MODDIR/$BACKEND \ + ${CONFIG} \ --shell=$SHELL_PLUGIN \ --socket=test-${TEST_NAME} \ --modules=$MODDIR/${TEST_FILE/.la/.so},$XWAYLAND_PLUGIN \ --log="$SERVERLOG" \ - ${CONFIG} \ &> "$OUTLOG" ;; ivi-*.weston) @@ -67,26 +67,26 @@ case $TEST_FILE in WESTON_BUILD_DIR=$abs_builddir \ WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \ - WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \ - --socket=test-${TEST_NAME} \ - --backend=$MODDIR/$BACKEND \ + WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \ + $WESTON --backend=$MODDIR/$BACKEND \ --config=$abs_builddir/tests/weston-ivi.ini \ --shell=$SHELL_PLUGIN \ - --log="$SERVERLOG" \ + --socket=test-${TEST_NAME} \ --modules=$TEST_PLUGIN \ + --log="$SERVERLOG" \ $($abs_builddir/$TESTNAME --params) \ &> "$OUTLOG" ;; *) WESTON_BUILD_DIR=$abs_builddir \ WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \ - WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \ - --socket=test-${TEST_NAME} \ - --backend=$MODDIR/$BACKEND \ + WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE \ + $WESTON --backend=$MODDIR/$BACKEND \ + ${CONFIG} \ --shell=$SHELL_PLUGIN \ - --log="$SERVERLOG" \ + --socket=test-${TEST_NAME} \ --modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \ - ${CONFIG} \ + --log="$SERVERLOG" \ $($abs_builddir/$TEST_FILE --params) \ &> "$OUTLOG" esac |