tests: Allow tests to use customized command line parameters
authorDerek Foreman <derekf@osg.samsung.com>
Wed, 19 Nov 2014 23:06:20 +0000 (15:06 -0800)
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>
Mon, 24 Nov 2014 10:21:05 +0000 (12:21 +0200)
Tests will now return the extra command line parameters they need
when run with --params

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
tests/weston-test-runner.c
tests/weston-tests-env

index ef45bae..ce0a670 100644 (file)
@@ -34,6 +34,8 @@
 
 #define SKIP 77
 
+char __attribute__((weak)) *server_parameters="";
+
 extern const struct weston_test __start_test_section, __stop_test_section;
 
 static const struct weston_test *
@@ -154,6 +156,12 @@ int main(int argc, char *argv[])
                        exit(EXIT_SUCCESS);
                }
 
+               if (strcmp(testname, "--params") == 0 ||
+                   strcmp(testname, "-p") == 0) {
+                       printf("%s", server_parameters);
+                       exit(EXIT_SUCCESS);
+               }
+
                t = find_test(argv[1]);
                if (t == NULL) {
                        fprintf(stderr, "unknown test: \"%s\"\n", argv[1]);
index e332354..aaf3ee1 100755 (executable)
@@ -46,5 +46,6 @@ case $TESTNAME in
                        --shell=$SHELL_PLUGIN \
                        --log="$SERVERLOG" \
                        --modules=$TEST_PLUGIN,$XWAYLAND_PLUGIN \
+                       $($abs_builddir/$TESTNAME --params) \
                        &> "$OUTLOG"
 esac