iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: mqueue: delete RUN_TESTS and EMIT_TESTS overrides

Browse Source 
Delete RUN_TESTS and EMIT_TESTS overrides and use common defines in lib.mk.
The overrides are in place to call mq_open_tests with queue name argument.
The change to delete overrides is coupled with a change to mq_open_tests
to use default queue name when it is called without one.

Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
Reviewed-by: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
This commit is contained in:
Shuah Khan (Samsung OSG) 2018-05-02 13:13:11 -06:00
parent addee42aaa
commit 978e9aa19b
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/testing/selftests/mqueue/Makefile
View File

@ -1,17 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
CFLAGS += -O2 CFLAGS += -O2
LDLIBS = -lrt -lpthread -lpopt LDLIBS = -lrt -lpthread -lpopt
TEST_GEN_PROGS := mq_open_tests mq_perf_tests TEST_GEN_PROGS := mq_open_tests mq_perf_tests
include ../lib.mk include ../lib.mk
override define RUN_TESTS
@$(OUTPUT)/mq_open_tests /test1 || echo "selftests: mq_open_tests [FAIL]"
@$(OUTPUT)/mq_perf_tests || echo "selftests: mq_perf_tests [FAIL]"
endef
override define EMIT_TESTS
echo "./mq_open_tests /test1 || echo \"selftests: mq_open_tests [FAIL]\""
echo "./mq_perf_tests || echo \"selftests: mq_perf_tests [FAIL]\""
endef

29
tools/testing/selftests/mqueue/mq_open_tests.c
View File

@ -53,6 +53,7 @@ int saved_def_msgs, saved_def_msgsize, saved_max_msgs, saved_max_msgsize;
int cur_def_msgs, cur_def_msgsize, cur_max_msgs, cur_max_msgsize; int cur_def_msgs, cur_def_msgsize, cur_max_msgs, cur_max_msgsize;
FILE *def_msgs, *def_msgsize, *max_msgs, *max_msgsize; FILE *def_msgs, *def_msgsize, *max_msgs, *max_msgsize;
char *queue_path; char *queue_path;
char *default_queue_path = "/test1";
mqd_t queue = -1; mqd_t queue = -1;
static inline void __set(FILE *stream, int value, char *err_msg); static inline void __set(FILE *stream, int value, char *err_msg);
@ -238,27 +239,27 @@ int main(int argc, char *argv[])
struct mq_attr attr, result; struct mq_attr attr, result;
if (argc != 2) { if (argc != 2) {
fprintf(stderr, "Must pass a valid queue name\n\n"); printf("Using Default queue path - %s\n", default_queue_path);
fprintf(stderr, usage, argv[0]); queue_path = default_queue_path;
exit(1); } else {
}
/* /*
* Although we can create a msg queue with a non-absolute path name, * Although we can create a msg queue with a non-absolute path name,
* unlink will fail. So, if the name doesn't start with a /, add one * unlink will fail. So, if the name doesn't start with a /, add one
* when we save it. * when we save it.
*/ */
if (*argv[1] == '/') if (*argv[1] == '/')
queue_path = strdup(argv[1]); queue_path = strdup(argv[1]);
else { else {
queue_path = malloc(strlen(argv[1]) + 2); queue_path = malloc(strlen(argv[1]) + 2);
if (!queue_path) { if (!queue_path) {
perror("malloc()"); perror("malloc()");
exit(1); exit(1);
}
queue_path[0] = '/';
queue_path[1] = 0;
strcat(queue_path, argv[1]);
} }
queue_path[0] = '/';
queue_path[1] = 0;
strcat(queue_path, argv[1]);
} }
if (getuid() != 0) { if (getuid() != 0) {