mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
4687 Commits
1 Branch
0 Tags
14 MiB
Tag: Branch: Tree: e00554bb70
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'e00554bb70'
${ noResults }
weston/tests/weston-tests-env

93 lines
2.4 KiB
Raw Normal View History Unescape

tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
#!/bin/bash
tests: Add an initial weston integration test The idea here is to make weston load test cases as a module and then run test cases from within weston.
13 years ago
tests: Keep track of basename basename returns the filename without path information (but with the file extension). We can get this more efficiently via shell variables. Also, for the socket name, use the test's name without the file extension. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> [Pekka: rebased without "tests: Support --config to enable tests to override config defaults".]
10 years ago
TEST_FILE=${1##*/}
TEST_NAME=${TEST_FILE%.*}
tests: use variable for test name in weston-tests-env Slightly more readable and makes it easier to switch to use $2 for something in the future (if that's ever needed).
11 years ago
tests: Prefer bracket form of test command for consistency Also use variable default assignment to eliminate an if clause Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years ago
if [ -z "$TEST_NAME" ]; then
tests: use variable for test name in weston-tests-env Slightly more readable and makes it easier to switch to use $2 for something in the future (if that's ever needed).
11 years ago
echo "usage: $(basename $0) <test name>"
exit 1;
fi
build: Move tests/Makefile.am into toplevel Makefile.am
11 years ago
WESTON=$abs_builddir/weston
tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
LOGDIR=$abs_builddir/logs
tests: Add error handling for system calls Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
10 years ago
mkdir -p "$LOGDIR" || exit
tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
tests: Cleanup test log filenames The log files were being named like: surface-global-test.la-log.txt surface-global-test.la-serverlog.txt surface-test.la-log.txt surface-test.la-serverlog.txt text.weston-log.txt text.weston-serverlog.txt For consistency, omit the test filename's extension (.la/.so). Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
SERVERLOG="$LOGDIR/${TEST_NAME}-serverlog.txt"
OUTLOG="$LOGDIR/${TEST_NAME}-log.txt"
tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
tests: Add error handling for system calls Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
10 years ago
rm -f "$SERVERLOG" || exit
tests: Add an initial weston integration test The idea here is to make weston load test cases as a module and then run test cases from within weston.
13 years ago
tests: Prefer bracket form of test command for consistency Also use variable default assignment to eliminate an if clause Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years ago
BACKEND=${BACKEND:-headless-backend.so}
tests: Pass --backend so the test suite runs with the right modules Without this we try to load the installed backends, which is nasty for regular runs, and just doesn't work for make distcheck, which sets prefix to $PWD/_inst. This makes sure we load the right backend and make distcheck pass. Other modules (xwayland, shells etc) just don't get loaded for distcheck and for make check we still try to load the installed modules.
12 years ago
tests: use MODDIR in weston-tests-env Make a little short-hand for the module directory. This also cleans up the redefinition of BACKEND in the script. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk> Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
MODDIR=$abs_builddir/.libs
SHELL_PLUGIN=$MODDIR/desktop-shell.so
TEST_PLUGIN=$MODDIR/weston-test.so
XWAYLAND_PLUGIN=$MODDIR/xwayland.so
tests: use the headless backend to run the test suite Other backends can be used by passing BACKEND=some-backend.so, e.g. $ make check BACKEND=x11-backend.so Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
11 years ago
tests: Support --config to enable tests to override config defaults Implements a simple mechanism to allow tests to customize the configuration. For a given <name>-test.c just place a <name>.ini file at the same location as the test itself. Alternately, you can generate a <name>.ini in the same directory that the compiled test is placed (i.e. the top builddir). If no configuration file is found, then no configuration will be used (i.e. --no-config is specified.) Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
10 years ago
CONFIG_FILE="${TEST_NAME}.ini"
if [ -e "${abs_builddir}/${CONFIG_FILE}" ]; then
CONFIG="--config=${abs_builddir}/${CONFIG_FILE}"
elif [ -e "${abs_top_srcdir}/tests/${CONFIG_FILE}" ]; then
CONFIG="--config=${abs_top_srcdir}/tests/${CONFIG_FILE}"
else
CONFIG="--no-config"
fi
tests: Keep track of basename basename returns the filename without path information (but with the file extension). We can get this more efficiently via shell variables. Also, for the socket name, use the test's name without the file extension. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> [Pekka: rebased without "tests: Support --config to enable tests to override config defaults".]
10 years ago
case $TEST_FILE in
tests: ivi_layout test infrastructure Testing the ivi_layout API requires two things: - the tests must be written as a controller module to access the API - the tests need a helper client to create some objects that can then be managed via the API This patch adds all the infrastructure and two different kinds of example tests. Internal ivi-shell (ivi_layout) API tests are listed as ivi-*.la files in TESTS in Makefile.am. Weston-tests-env detects these, and runs Weston with ivi-shell, and loads the given module as a controller module, not as a normal plugin. The test controller module ivi-*.la will launch a helper client. For ivi-layout-test.la the helper client is ivi-layout.ivi. The helper client uses the weston-test-runner framework to fork and exec each TEST with a fresh connection to the compositor. The actual test is triggered by the weston_test_runner protocol interface, a new addition to weston-test.xml. The helper client uses weston_test_runner to trigger a test, and the server side of the interface is implemented by the test controller module (ivi-layout-test.la). The server side of weston_test_runner uses the same trick as weston-test-runner.h to gather a list of defined tests. A test is defined with the RUNNER_TEST macro. If a test defined by RUNNER_TEST succeeds, an event is sent to the helper client that it can continue (or exit). If a test fails, a fatal protocol error is sent to the helper client. Once the helper client has iterated over all of its tests, it signals the batch success/failure via process exit code. That is cought in the test controller module, and forwarded as Weston's exit code. In summary: each ivi_layout test is a combination of a client side helper/setup and server side actual tests. v2: Load weston-test.so, because create_client() needs it. v3: add a comment about IVI_TEST_SURFACE_ID_BASE. v4: Rebased to upstream weston-tests-env changes. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> (v2)
10 years ago
ivi-*.la|ivi-*.so)
SHELL_PLUGIN=$MODDIR/ivi-shell.so
WESTON_BUILD_DIR=$abs_builddir \
tests: Set up the reference image environment variable make check failed for out of tree builds because we didn't set up WESTON_TEST_REFERENCE_PATH in weston-tests-env Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Tested-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
tests: ivi_layout test infrastructure Testing the ivi_layout API requires two things: - the tests must be written as a controller module to access the API - the tests need a helper client to create some objects that can then be managed via the API This patch adds all the infrastructure and two different kinds of example tests. Internal ivi-shell (ivi_layout) API tests are listed as ivi-*.la files in TESTS in Makefile.am. Weston-tests-env detects these, and runs Weston with ivi-shell, and loads the given module as a controller module, not as a normal plugin. The test controller module ivi-*.la will launch a helper client. For ivi-layout-test.la the helper client is ivi-layout.ivi. The helper client uses the weston-test-runner framework to fork and exec each TEST with a fresh connection to the compositor. The actual test is triggered by the weston_test_runner protocol interface, a new addition to weston-test.xml. The helper client uses weston_test_runner to trigger a test, and the server side of the interface is implemented by the test controller module (ivi-layout-test.la). The server side of weston_test_runner uses the same trick as weston-test-runner.h to gather a list of defined tests. A test is defined with the RUNNER_TEST macro. If a test defined by RUNNER_TEST succeeds, an event is sent to the helper client that it can continue (or exit). If a test fails, a fatal protocol error is sent to the helper client. Once the helper client has iterated over all of its tests, it signals the batch success/failure via process exit code. That is cought in the test controller module, and forwarded as Weston's exit code. In summary: each ivi_layout test is a combination of a client side helper/setup and server side actual tests. v2: Load weston-test.so, because create_client() needs it. v3: add a comment about IVI_TEST_SURFACE_ID_BASE. v4: Rebased to upstream weston-tests-env changes. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> (v2)
10 years ago
$WESTON --backend=$MODDIR/$BACKEND \
--config=$abs_builddir/tests/weston-ivi.ini \
--shell=$SHELL_PLUGIN \
--socket=test-${TEST_NAME} \
--modules=$TEST_PLUGIN \
--ivi-module=$MODDIR/${TEST_FILE/.la/.so} \
--log="$SERVERLOG" \
&> "$OUTLOG"
;;
tests: Allow weston-tests-env to process different test types The weston-tests-env script needs to be able to handle weston test extension style tests as well as module style tests. Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
12 years ago
*.la|*.so)
tests: allow running make check without make install desktop shell and weston keyboard both refer to themselves prefixed by LIBEXECDIR, however this is only valid once installed. make check will currently either fail or run pre-existing versions. This patch adds a way to override that location by setting the env var WESTON_BUILD_DIR - which is then set by the test env script so make check will test the versions in the build directory regardless of whether they're installed or not. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years ago
WESTON_BUILD_DIR=$abs_builddir \
tests: Set up the reference image environment variable make check failed for out of tree builds because we didn't set up WESTON_TEST_REFERENCE_PATH in weston-tests-env Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Tested-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
tests: use MODDIR in weston-tests-env Make a little short-hand for the module directory. This also cleans up the redefinition of BACKEND in the script. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk> Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
$WESTON --backend=$MODDIR/$BACKEND \
tests: load the right shell plugin Again, load the shell plugin with full path, rather than possibly find an old version from a previous installation. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
11 years ago
--shell=$SHELL_PLUGIN \
tests: Keep track of basename basename returns the filename without path information (but with the file extension). We can get this more efficiently via shell variables. Also, for the socket name, use the test's name without the file extension. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> [Pekka: rebased without "tests: Support --config to enable tests to override config defaults".]
10 years ago
--socket=test-${TEST_NAME} \
--modules=$MODDIR/${TEST_FILE/.la/.so},$XWAYLAND_PLUGIN \
tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
--log="$SERVERLOG" \
tests: Support --config to enable tests to override config defaults Implements a simple mechanism to allow tests to customize the configuration. For a given <name>-test.c just place a <name>.ini file at the same location as the test itself. Alternately, you can generate a <name>.ini in the same directory that the compiled test is placed (i.e. the top builddir). If no configuration file is found, then no configuration will be used (i.e. --no-config is specified.) Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
10 years ago
${CONFIG} \
tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
&> "$OUTLOG"
tests: Allow weston-tests-env to process different test types The weston-tests-env script needs to be able to handle weston test extension style tests as well as module style tests. Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
12 years ago
;;
tests: add a basic ivi-shell test This simply tests that Weston starts with ivi-shell, and ivi_application is present. Changes in v3: - Rebased to upstream weston-tests-env changes. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> (v2)
10 years ago
ivi-*.weston)
SHELL_PLUGIN=$MODDIR/ivi-shell.so
WESTON_BUILD_DIR=$abs_builddir \
tests: Set up the reference image environment variable make check failed for out of tree builds because we didn't set up WESTON_TEST_REFERENCE_PATH in weston-tests-env Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Tested-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
tests: add a basic ivi-shell test This simply tests that Weston starts with ivi-shell, and ivi_application is present. Changes in v3: - Rebased to upstream weston-tests-env changes. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> (v2)
10 years ago
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \
--socket=test-${TEST_NAME} \
--backend=$MODDIR/$BACKEND \
--config=$abs_builddir/tests/weston-ivi.ini \
--shell=$SHELL_PLUGIN \
--log="$SERVERLOG" \
--modules=$TEST_PLUGIN \
$($abs_builddir/$TESTNAME --params) \
&> "$OUTLOG"
;;
tests: Allow weston-tests-env to process different test types The weston-tests-env script needs to be able to handle weston test extension style tests as well as module style tests. Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
12 years ago
*)
tests: allow running make check without make install desktop shell and weston keyboard both refer to themselves prefixed by LIBEXECDIR, however this is only valid once installed. make check will currently either fail or run pre-existing versions. This patch adds a way to override that location by setting the env var WESTON_BUILD_DIR - which is then set by the test env script so make check will test the versions in the build directory regardless of whether they're installed or not. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years ago
WESTON_BUILD_DIR=$abs_builddir \
tests: Set up the reference image environment variable make check failed for out of tree builds because we didn't set up WESTON_TEST_REFERENCE_PATH in weston-tests-env Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Tested-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
WESTON_TEST_REFERENCE_PATH=$abs_top_srcdir/tests/reference \
tests: Keep track of basename basename returns the filename without path information (but with the file extension). We can get this more efficiently via shell variables. Also, for the socket name, use the test's name without the file extension. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> [Pekka: rebased without "tests: Support --config to enable tests to override config defaults".]
10 years ago
WESTON_TEST_CLIENT_PATH=$abs_builddir/$TEST_FILE $WESTON \
--socket=test-${TEST_NAME} \
tests: use MODDIR in weston-tests-env Make a little short-hand for the module directory. This also cleans up the redefinition of BACKEND in the script. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk> Reviewed-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
--backend=$MODDIR/$BACKEND \
tests: load the right shell plugin Again, load the shell plugin with full path, rather than possibly find an old version from a previous installation. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
11 years ago
--shell=$SHELL_PLUGIN \
tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
--log="$SERVERLOG" \
tests: load the right xwayland plugin If we do not specify the full path to xwayland.so, Weston can find an old one installed in a $prefix and use that instead of the freshly built one. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
11 years ago
--modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
tests: Support --config to enable tests to override config defaults Implements a simple mechanism to allow tests to customize the configuration. For a given <name>-test.c just place a <name>.ini file at the same location as the test itself. Alternately, you can generate a <name>.ini in the same directory that the compiled test is placed (i.e. the top builddir). If no configuration file is found, then no configuration will be used (i.e. --no-config is specified.) Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-By: Derek Foreman <derekf@osg.samsung.com>
10 years ago
${CONFIG} \
tests: Keep track of basename basename returns the filename without path information (but with the file extension). We can get this more efficiently via shell variables. Also, for the socket name, use the test's name without the file extension. Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> [Pekka: rebased without "tests: Support --config to enable tests to override config defaults".]
10 years ago
$($abs_builddir/$TEST_FILE --params) \
tests: write logs to files This cleans up the 'make check' output considerably. When all goes well, you will only see the "PASS" line for each of $TESTS. Weston logs into a separate file than stdout and stderr, so server logs end up in one file per test, and other output to another file per test. 'make distclean' does not remove the tests/logs/ directory. Also changes the weston-tests-env interpreter to bash, since I think &> and ${1/.la/.so} might be bashisms.
12 years ago
&> "$OUTLOG"
tests: Allow weston-tests-env to process different test types The weston-tests-env script needs to be able to handle weston test extension style tests as well as module style tests. Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
12 years ago
esac