This replaces the old test harness with a new one. The old harness relied on fork()'ing each test which makes tests independent, but makes debugging them harder. The new harness runs client code in a thread instead of a new process. A side-effect of not fork()'ing anymore is that any failure will stop running a test series short. Fortunately we do not have any tests that are expected to crash or fail. The old harness executed 'weston' from Meson, with lots of setup as both command line options and environment variables. The new harness executes wet_main() instead: the test program itself calls the compositor main function to execute the compositor in-process. Command line arguments are configured in the test program itself, not in meson.build. Environment variables aside, you are able to run a test by simply executing the test program, even if it is a plugin test. The new harness adds a new type of iteration: fixtures. For now, fixtures are used to set up the compositor for tests that need a compositor. If necessary, a fixture setup may include a data array of arbitrary type for executing the test series for each element in the array. This will be most useful for running screenshooting tests with both Pixman- and GL-renderers. The new harness outputs TAP formatted results into stdout. Meson is not switched to consume TAP yet though, because it would require a Meson version requirement bump and would not have any benefits at this time. OTOH outputting TAP is trivial and sets up a clear precedent of random test chatter belonging to stderr. This commit migrates only few tests to actually make use of the new features: roles is a basic client test, subsurface-shot is a client test that demonstrates the fixture array, and plugin-registry is a plugin test. The rest of the tests will be migrated later. Once all tests are migrated, we can remove the test-specific setup from meson.build, leaving only the actual build instructions in there. The not migrated tests and stand-alone tests suffer only a minor change: they no longer fork() for each TEST(), otherwise they keep running as before. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>dev
parent
2c8203dcb0
commit
babb3b3bc2
@ -0,0 +1,277 @@ |
|||||||
|
/*
|
||||||
|
* Copyright 2019 Collabora, Ltd. |
||||||
|
* |
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining |
||||||
|
* a copy of this software and associated documentation files (the |
||||||
|
* "Software"), to deal in the Software without restriction, including |
||||||
|
* without limitation the rights to use, copy, modify, merge, publish, |
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to |
||||||
|
* permit persons to whom the Software is furnished to do so, subject to |
||||||
|
* the following conditions: |
||||||
|
* |
||||||
|
* The above copyright notice and this permission notice (including the |
||||||
|
* next paragraph) shall be included in all copies or substantial |
||||||
|
* portions of the Software. |
||||||
|
* |
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||||
|
* SOFTWARE. |
||||||
|
*/ |
||||||
|
|
||||||
|
#include "config.h" |
||||||
|
|
||||||
|
#include <string.h> |
||||||
|
#include <assert.h> |
||||||
|
|
||||||
|
#include "shared/helpers.h" |
||||||
|
#include "weston-test-fixture-compositor.h" |
||||||
|
#include "weston.h" |
||||||
|
|
||||||
|
struct prog_args { |
||||||
|
int argc; |
||||||
|
char **argv; |
||||||
|
char **saved; |
||||||
|
int alloc; |
||||||
|
}; |
||||||
|
|
||||||
|
static void |
||||||
|
prog_args_init(struct prog_args *p) |
||||||
|
{ |
||||||
|
memset(p, 0, sizeof(*p)); |
||||||
|
} |
||||||
|
|
||||||
|
static void |
||||||
|
prog_args_take(struct prog_args *p, char *arg) |
||||||
|
{ |
||||||
|
assert(arg); |
||||||
|
|
||||||
|
if (p->argc == p->alloc) { |
||||||
|
p->alloc += 10; |
||||||
|
p->argv = realloc(p->argv, sizeof(char *) * p->alloc); |
||||||
|
assert(p->argv); |
||||||
|
} |
||||||
|
|
||||||
|
p->argv[p->argc++] = arg; |
||||||
|
} |
||||||
|
|
||||||
|
/*
|
||||||
|
* The program to be executed will trample on argv, hence we need a copy to |
||||||
|
* be able to free all our args. |
||||||
|
*/ |
||||||
|
static void |
||||||
|
prog_args_save(struct prog_args *p) |
||||||
|
{ |
||||||
|
assert(p->saved == NULL); |
||||||
|
|
||||||
|
p->saved = calloc(p->argc, sizeof(char *)); |
||||||
|
assert(p->saved); |
||||||
|
|
||||||
|
memcpy(p->saved, p->argv, sizeof(char *) * p->argc); |
||||||
|
} |
||||||
|
|
||||||
|
static void |
||||||
|
prog_args_fini(struct prog_args *p) |
||||||
|
{ |
||||||
|
int i; |
||||||
|
|
||||||
|
assert(p->saved); |
||||||
|
|
||||||
|
for (i = 0; i < p->argc; i++) |
||||||
|
free(p->saved[i]); |
||||||
|
free(p->saved); |
||||||
|
free(p->argv); |
||||||
|
prog_args_init(p); |
||||||
|
} |
||||||
|
|
||||||
|
/** Initialize part of compositor setup
|
||||||
|
* |
||||||
|
* \param setup The variable to initialize. |
||||||
|
* \param testset_name Value for testset_name member. |
||||||
|
* |
||||||
|
* \ingroup testharness_private |
||||||
|
*/ |
||||||
|
void |
||||||
|
compositor_setup_defaults_(struct compositor_setup *setup, |
||||||
|
const char *testset_name) |
||||||
|
{ |
||||||
|
*setup = (struct compositor_setup) { |
||||||
|
.backend = WESTON_BACKEND_HEADLESS, |
||||||
|
.renderer = RENDERER_NOOP, |
||||||
|
.shell = SHELL_DESKTOP, |
||||||
|
.xwayland = false, |
||||||
|
.width = 320, |
||||||
|
.height = 240, |
||||||
|
.config_file = NULL, |
||||||
|
.extra_module = NULL, |
||||||
|
.logging_scopes = NULL, |
||||||
|
.testset_name = testset_name, |
||||||
|
}; |
||||||
|
} |
||||||
|
|
||||||
|
static const char * |
||||||
|
backend_to_str(enum weston_compositor_backend b) |
||||||
|
{ |
||||||
|
static const char * const names[] = { |
||||||
|
[WESTON_BACKEND_DRM] = "drm-backend.so", |
||||||
|
[WESTON_BACKEND_FBDEV] = "fbdev-backend.so", |
||||||
|
[WESTON_BACKEND_HEADLESS] = "headless-backend.so", |
||||||
|
[WESTON_BACKEND_RDP] = "rdp-backend.so", |
||||||
|
[WESTON_BACKEND_WAYLAND] = "wayland-backend.so", |
||||||
|
[WESTON_BACKEND_X11] = "X11-backend.so", |
||||||
|
}; |
||||||
|
assert(b >= 0 && b < ARRAY_LENGTH(names)); |
||||||
|
return names[b]; |
||||||
|
} |
||||||
|
|
||||||
|
static const char * |
||||||
|
renderer_to_arg(enum weston_compositor_backend b, enum renderer_type r) |
||||||
|
{ |
||||||
|
static const char * const headless_names[] = { |
||||||
|
[RENDERER_NOOP] = NULL, |
||||||
|
[RENDERER_PIXMAN] = "--use-pixman", |
||||||
|
[RENDERER_GL] = "--use-gl", |
||||||
|
}; |
||||||
|
|
||||||
|
assert(r >= 0 && r < ARRAY_LENGTH(headless_names)); |
||||||
|
|
||||||
|
switch (b) { |
||||||
|
case WESTON_BACKEND_HEADLESS: |
||||||
|
return headless_names[r]; |
||||||
|
default: |
||||||
|
assert(0 && "renderer_to_str() does not know the backend"); |
||||||
|
} |
||||||
|
|
||||||
|
return NULL; |
||||||
|
} |
||||||
|
|
||||||
|
static const char * |
||||||
|
shell_to_str(enum shell_type t) |
||||||
|
{ |
||||||
|
static const char * const names[] = { |
||||||
|
[SHELL_TEST_DESKTOP] = "weston-test-desktop-shell.so", |
||||||
|
[SHELL_DESKTOP] = "desktop-shell.so", |
||||||
|
[SHELL_FULLSCREEN] = "fullscreen-shell.so", |
||||||
|
[SHELL_IVI] = "ivi-shell.so", |
||||||
|
}; |
||||||
|
assert(t >= 0 && t < ARRAY_LENGTH(names)); |
||||||
|
return names[t]; |
||||||
|
} |
||||||
|
|
||||||
|
/** Execute compositor
|
||||||
|
* |
||||||
|
* Manufactures the compositor command line and calls wet_main(). |
||||||
|
* |
||||||
|
* Returns RESULT_SKIP if the given setup contains features that were disabled |
||||||
|
* in the build, e.g. GL-renderer or DRM-backend. |
||||||
|
* |
||||||
|
* \ingroup testharness_private |
||||||
|
*/ |
||||||
|
int |
||||||
|
execute_compositor(const struct compositor_setup *setup, |
||||||
|
struct wet_testsuite_data *data) |
||||||
|
{ |
||||||
|
struct prog_args args; |
||||||
|
char *tmp; |
||||||
|
const char *ctmp; |
||||||
|
int ret; |
||||||
|
|
||||||
|
#ifndef BUILD_DRM_COMPOSITOR |
||||||
|
if (setup->backend == WESTON_BACKEND_DRM) { |
||||||
|
fprintf(stderr, "DRM-backend required but not built, skipping.\n"); |
||||||
|
return RESULT_SKIP; |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
#ifndef BUILD_FBDEV_COMPOSITOR |
||||||
|
if (setup->backend == WESTON_BACKEND_FBDEV) { |
||||||
|
fprintf(stderr, "fbdev-backend required but not built, skipping.\n"); |
||||||
|
return RESULT_SKIP; |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
#ifndef BUILD_RDP_COMPOSITOR |
||||||
|
if (setup->backend == WESTON_BACKEND_RDP) { |
||||||
|
fprintf(stderr, "RDP-backend required but not built, skipping.\n"); |
||||||
|
return RESULT_SKIP; |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
#ifndef BUILD_WAYLAND_COMPOSITOR |
||||||
|
if (setup->backend == WESTON_BACKEND_WAYLAND) { |
||||||
|
fprintf(stderr, "wayland-backend required but not built, skipping.\n"); |
||||||
|
return RESULT_SKIP; |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
#ifndef BUILD_X11_COMPOSITOR |
||||||
|
if (setup->backend == WESTON_BACKEND_X11) { |
||||||
|
fprintf(stderr, "X11-backend required but not built, skipping.\n"); |
||||||
|
return RESULT_SKIP; |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
#ifndef ENABLE_EGL |
||||||
|
if (setup->renderer == RENDERER_GL) { |
||||||
|
fprintf(stderr, "GL-renderer required but not built, skipping.\n"); |
||||||
|
return RESULT_SKIP; |
||||||
|
} |
||||||
|
#endif |
||||||
|
|
||||||
|
prog_args_init(&args); |
||||||
|
|
||||||
|
/* argv[0] */ |
||||||
|
asprintf(&tmp, "weston-%s", setup->testset_name); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
|
||||||
|
asprintf(&tmp, "--backend=%s", backend_to_str(setup->backend)); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
|
||||||
|
asprintf(&tmp, "--socket=%s", setup->testset_name); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
|
||||||
|
asprintf(&tmp, "--modules=%s%s%s", TESTSUITE_PLUGIN_PATH, |
||||||
|
setup->extra_module ? "," : "", |
||||||
|
setup->extra_module ? setup->extra_module : ""); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
|
||||||
|
asprintf(&tmp, "--width=%d", setup->width); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
|
||||||
|
asprintf(&tmp, "--height=%d", setup->height); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
|
||||||
|
if (setup->config_file) { |
||||||
|
asprintf(&tmp, "--config=%s", setup->config_file); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
} else { |
||||||
|
prog_args_take(&args, strdup("--no-config")); |
||||||
|
} |
||||||
|
|
||||||
|
ctmp = renderer_to_arg(setup->backend, setup->renderer); |
||||||
|
if (ctmp) |
||||||
|
prog_args_take(&args, strdup(ctmp)); |
||||||
|
|
||||||
|
asprintf(&tmp, "--shell=%s", shell_to_str(setup->shell)); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
|
||||||
|
if (setup->logging_scopes) { |
||||||
|
asprintf(&tmp, "--logger-scopes=%s", setup->logging_scopes); |
||||||
|
prog_args_take(&args, tmp); |
||||||
|
} |
||||||
|
|
||||||
|
if (setup->xwayland) |
||||||
|
prog_args_take(&args, strdup("--xwayland")); |
||||||
|
|
||||||
|
wet_testsuite_data_set(data); |
||||||
|
prog_args_save(&args); |
||||||
|
ret = wet_main(args.argc, args.argv); |
||||||
|
|
||||||
|
prog_args_fini(&args); |
||||||
|
|
||||||
|
return ret; |
||||||
|
} |
@ -0,0 +1,127 @@ |
|||||||
|
/*
|
||||||
|
* Copyright 2019 Collabora, Ltd. |
||||||
|
* |
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining |
||||||
|
* a copy of this software and associated documentation files (the |
||||||
|
* "Software"), to deal in the Software without restriction, including |
||||||
|
* without limitation the rights to use, copy, modify, merge, publish, |
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to |
||||||
|
* permit persons to whom the Software is furnished to do so, subject to |
||||||
|
* the following conditions: |
||||||
|
* |
||||||
|
* The above copyright notice and this permission notice (including the |
||||||
|
* next paragraph) shall be included in all copies or substantial |
||||||
|
* portions of the Software. |
||||||
|
* |
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||||
|
* SOFTWARE. |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef WESTON_TEST_FIXTURE_COMPOSITOR_H |
||||||
|
#define WESTON_TEST_FIXTURE_COMPOSITOR_H |
||||||
|
|
||||||
|
#include <libweston/libweston.h> |
||||||
|
|
||||||
|
#include "weston-testsuite-data.h" |
||||||
|
|
||||||
|
/** Weston renderer type
|
||||||
|
* |
||||||
|
* \sa compositor_setup |
||||||
|
* \ingroup testharness |
||||||
|
*/ |
||||||
|
enum renderer_type { |
||||||
|
/** Dummy renderer that does nothing. */ |
||||||
|
RENDERER_NOOP = 0, |
||||||
|
/** Pixman-renderer */ |
||||||
|
RENDERER_PIXMAN, |
||||||
|
/** GL-renderer */ |
||||||
|
RENDERER_GL |
||||||
|
}; |
||||||
|
|
||||||
|
/** Weston shell plugin
|
||||||
|
* |
||||||
|
* \sa compositor_setup |
||||||
|
* \ingroup testharness |
||||||
|
*/ |
||||||
|
enum shell_type { |
||||||
|
/** Desktop test-shell with predictable window placement and
|
||||||
|
* no helper clients */ |
||||||
|
SHELL_TEST_DESKTOP = 0, |
||||||
|
/** The full desktop shell. */ |
||||||
|
SHELL_DESKTOP, |
||||||
|
/** The ivi-shell. */ |
||||||
|
SHELL_IVI, |
||||||
|
/** The fullscreen-shell. */ |
||||||
|
SHELL_FULLSCREEN |
||||||
|
}; |
||||||
|
|
||||||
|
/** Weston compositor configuration
|
||||||
|
* |
||||||
|
* This structure determines the Weston compositor command line arguments. |
||||||
|
* You should always use compositor_setup_defaults() to initialize this, then |
||||||
|
* override any members you need with assignments. |
||||||
|
* |
||||||
|
* \ingroup testharness |
||||||
|
*/ |
||||||
|
struct compositor_setup { |
||||||
|
/** The backend to use. */ |
||||||
|
enum weston_compositor_backend backend; |
||||||
|
/** The renderer to use. */ |
||||||
|
enum renderer_type renderer; |
||||||
|
/** The shell plugin to use. */ |
||||||
|
enum shell_type shell; |
||||||
|
/** Whether to enable xwayland support. */ |
||||||
|
bool xwayland; |
||||||
|
/** Default output width. */ |
||||||
|
unsigned width; |
||||||
|
/** Default output height. */ |
||||||
|
unsigned height; |
||||||
|
/** The absolute path to \c weston.ini to use,
|
||||||
|
* or NULL for \c --no-config . */ |
||||||
|
const char *config_file; |
||||||
|
/** Full path to an extra plugin to load, or NULL for none. */ |
||||||
|
const char *extra_module; |
||||||
|
/** Debug scopes for the compositor log,
|
||||||
|
* or NULL for compositor defaults. */ |
||||||
|
const char *logging_scopes; |
||||||
|
/** The name of this test program, used as a unique identifier. */ |
||||||
|
const char *testset_name; |
||||||
|
}; |
||||||
|
|
||||||
|
void |
||||||
|
compositor_setup_defaults_(struct compositor_setup *setup, |
||||||
|
const char *testset_name); |
||||||
|
|
||||||
|
/** Initialize compositor setup to defaults
|
||||||
|
* |
||||||
|
* \param s The variable to initialize. |
||||||
|
* |
||||||
|
* The defaults are: |
||||||
|
* - backend: headless |
||||||
|
* - renderer: noop |
||||||
|
* - shell: desktop shell |
||||||
|
* - xwayland: no |
||||||
|
* - width: 320 |
||||||
|
* - height: 240 |
||||||
|
* - config_file: none |
||||||
|
* - extra_module: none |
||||||
|
* - logging_scopes: compositor defaults |
||||||
|
* - testset_name: the test name from meson.build |
||||||
|
* |
||||||
|
* \ingroup testharness |
||||||
|
*/ |
||||||
|
#define compositor_setup_defaults(s) do {\ |
||||||
|
compositor_setup_defaults_(s, THIS_TEST_NAME); \
|
||||||
|
} while (0) |
||||||
|
|
||||||
|
int |
||||||
|
execute_compositor(const struct compositor_setup *setup, |
||||||
|
struct wet_testsuite_data *data); |
||||||
|
|
||||||
|
#endif /* WESTON_TEST_FIXTURE_COMPOSITOR_H */ |
@ -0,0 +1,88 @@ |
|||||||
|
/*
|
||||||
|
* Copyright 2019 Collabora, Ltd. |
||||||
|
* |
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining |
||||||
|
* a copy of this software and associated documentation files (the |
||||||
|
* "Software"), to deal in the Software without restriction, including |
||||||
|
* without limitation the rights to use, copy, modify, merge, publish, |
||||||
|
* distribute, sublicense, and/or sell copies of the Software, and to |
||||||
|
* permit persons to whom the Software is furnished to do so, subject to |
||||||
|
* the following conditions: |
||||||
|
* |
||||||
|
* The above copyright notice and this permission notice (including the |
||||||
|
* next paragraph) shall be included in all copies or substantial |
||||||
|
* portions of the Software. |
||||||
|
* |
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
||||||
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
||||||
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
||||||
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
||||||
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
||||||
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
||||||
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
||||||
|
* SOFTWARE. |
||||||
|
*/ |
||||||
|
|
||||||
|
#ifndef WESTON_TESTSUITE_DATA_H |
||||||
|
#define WESTON_TESTSUITE_DATA_H |
||||||
|
|
||||||
|
/** Standard return codes
|
||||||
|
* |
||||||
|
* Both Autotools and Meson use these codes as test program exit codes |
||||||
|
* to denote the test result for the whole process. |
||||||
|
* |
||||||
|
* \ingroup testharness |
||||||
|
*/ |
||||||
|
enum test_result_code { |
||||||
|
RESULT_OK = 0, |
||||||
|
RESULT_SKIP = 77, |
||||||
|
RESULT_FAIL = 1, |
||||||
|
RESULT_HARD_ERROR = 99, |
||||||
|
}; |
||||||
|
|
||||||
|
struct weston_test; |
||||||
|
struct weston_compositor; |
||||||
|
|
||||||
|
/** Weston test types
|
||||||
|
* |
||||||
|
* \sa weston_test_harness_execute_standalone |
||||||
|
* weston_test_harness_execute_as_plugin |
||||||
|
* weston_test_harness_execute_as_client |
||||||
|
* |
||||||
|
* \ingroup testharness_private |
||||||
|
*/ |
||||||
|
enum test_type { |
||||||
|
TEST_TYPE_STANDALONE, |
||||||
|
TEST_TYPE_PLUGIN, |
||||||
|
TEST_TYPE_CLIENT, |
||||||
|
}; |
||||||
|
|
||||||
|
/** Test harness specific data for running tests
|
||||||
|
* |
||||||
|
* \ingroup testharness_private |
||||||
|
*/ |
||||||
|
struct wet_testsuite_data { |
||||||
|
void (*run)(struct wet_testsuite_data *); |
||||||
|
|
||||||
|
/* test definitions */ |
||||||
|
const struct weston_test_entry *tests; |
||||||
|
unsigned tests_count; |
||||||
|
int case_index; |
||||||
|
enum test_type type; |
||||||
|
struct weston_compositor *compositor; |
||||||
|
|
||||||
|
/* client thread control */ |
||||||
|
int thread_event_pipe; |
||||||
|
|
||||||
|
/* informational run state */ |
||||||
|
int fixture_iteration; |
||||||
|
|
||||||
|
/* test counts */ |
||||||
|
unsigned counter; |
||||||
|
unsigned passed; |
||||||
|
unsigned skipped; |
||||||
|
unsigned failed; |
||||||
|
unsigned total; |
||||||
|
}; |
||||||
|
|
||||||
|
#endif /* WESTON_TESTSUITE_DATA_H */ |
Loading…
Reference in new issue