projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: gen-ust-events: abort() on argument error
[lttng-tools.git]
/
tests
/
utils
/
testapp
/
gen-ust-events
/
gen-ust-events.c
diff --git
a/tests/utils/testapp/gen-ust-events/gen-ust-events.c
b/tests/utils/testapp/gen-ust-events/gen-ust-events.c
index 364545d5279e3fda785e566cf02115a3ccaccd9e..8f2acdbabbfbb28ab8a72b4bb5c4f03dfa8960d4 100644
(file)
--- a/
tests/utils/testapp/gen-ust-events/gen-ust-events.c
+++ b/
tests/utils/testapp/gen-ust-events/gen-ust-events.c
@@
-45,6
+45,9
@@
static struct option long_options[] =
{"wait", required_argument, 0, 'w'},
{"sync-after-first-event", required_argument, 0, 'a'},
{"sync-before-last-event", required_argument, 0, 'b'},
{"wait", required_argument, 0, 'w'},
{"sync-after-first-event", required_argument, 0, 'a'},
{"sync-before-last-event", required_argument, 0, 'b'},
+ {"sync-before-last-event-touch", required_argument, 0, 'c'},
+ {"sync-before-exit", required_argument, 0, 'd'},
+ {"sync-before-exit-touch", required_argument, 0, 'e'},
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
@@
-61,6
+64,15
@@
int main(int argc, char **argv)
useconds_t nr_usec = 0;
char *after_first_event_file_path = NULL;
char *before_last_event_file_path = NULL;
useconds_t nr_usec = 0;
char *after_first_event_file_path = NULL;
char *before_last_event_file_path = NULL;
+ /*
+ * Touch a file to indicate that all events except one were
+ * generated.
+ */
+ char *before_last_event_file_path_touch = NULL;
+ /* Touch file when we are exiting */
+ char *before_exit_file_path_touch = NULL;
+ /* Wait on file before exiting */
+ char *before_exit_file_path = NULL;
while ((option = getopt_long(argc, argv, "i:w:a:b:c:d:",
long_options, &option_index)) != -1) {
while ((option = getopt_long(argc, argv, "i:w:a:b:c:d:",
long_options, &option_index)) != -1) {
@@
-71,6
+83,15
@@
int main(int argc, char **argv)
case 'b':
before_last_event_file_path = strdup(optarg);
break;
case 'b':
before_last_event_file_path = strdup(optarg);
break;
+ case 'c':
+ before_last_event_file_path_touch = strdup(optarg);
+ break;
+ case 'd':
+ before_exit_file_path = strdup(optarg);
+ break;
+ case 'e':
+ before_exit_file_path_touch = strdup(optarg);
+ break;
case 'i':
nr_iter = atoi(optarg);
break;
case 'i':
nr_iter = atoi(optarg);
break;
@@
-88,6
+109,17
@@
int main(int argc, char **argv)
if (optind != argc) {
fprintf(stderr, "Error: takes long options only.\n");
if (optind != argc) {
fprintf(stderr, "Error: takes long options only.\n");
+
+ /*
+ * Aborting the test program for now because callers typically don't check
+ * the test program return value, and the transition from positional
+ * arguments to getopt causes hangs when caller scripts are not updated.
+ * An abort is easier to diagnose and fix. This is a temporary solution:
+ * we should eventually ensure that all scripts test and report the test
+ * app return values.
+ */
+ abort();
+
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-100,6
+132,13
@@
int main(int argc, char **argv)
for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
if (nr_iter >= 0 && i == nr_iter - 1) {
for (i = 0; nr_iter < 0 || i < nr_iter; i++) {
if (nr_iter >= 0 && i == nr_iter - 1) {
+ if (before_last_event_file_path_touch) {
+ ret = create_file(before_last_event_file_path_touch);
+ if (ret != 0) {
+ goto end;
+ }
+ }
+
/*
* Wait on synchronization before writing last
* event.
/*
* Wait on synchronization before writing last
* event.
@@
-140,8
+179,23
@@
int main(int argc, char **argv)
}
}
}
}
+ if (before_exit_file_path_touch) {
+ ret = create_file(before_exit_file_path_touch);
+ if (ret != 0) {
+ goto end;
+ }
+ }
+ if (before_exit_file_path) {
+ ret = wait_on_file(before_exit_file_path);
+ if (ret != 0) {
+ goto end;
+ }
+ }
end:
free(after_first_event_file_path);
free(before_last_event_file_path);
end:
free(after_first_event_file_path);
free(before_last_event_file_path);
+ free(before_last_event_file_path_touch);
+ free(before_exit_file_path);
+ free(before_exit_file_path_touch);
exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
}
exit(!ret ? EXIT_SUCCESS : EXIT_FAILURE);
}
This page took
0.031613 seconds
and
4
git commands to generate.