From 7f6a47ce87b0ec0fa7d58684976c00d16d8f547e Mon Sep 17 00:00:00 2001 From: Andre Maroneze <andre.maroneze@cea.fr> Date: Sun, 27 Mar 2022 18:47:28 +0200 Subject: [PATCH] [Instantiate] ensure newline termination and distribute test files --- src/plugins/instantiate/Makefile.in | 8 ++++++++ src/plugins/instantiate/tests/options/test_config | 2 +- src/plugins/instantiate/tests/plugin/ast_clear.c | 2 +- src/plugins/instantiate/tests/plugin/function_pointers.i | 2 +- src/plugins/instantiate/tests/stdlib/calloc.c | 2 +- src/plugins/instantiate/tests/stdlib/free.c | 2 +- src/plugins/instantiate/tests/stdlib/malloc.c | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/plugins/instantiate/Makefile.in b/src/plugins/instantiate/Makefile.in index 5658325fc33..1243f1bb6be 100644 --- a/src/plugins/instantiate/Makefile.in +++ b/src/plugins/instantiate/Makefile.in @@ -66,6 +66,14 @@ PLUGIN_DISTRIBUTED := $(PLUGIN_ENABLE) PLUGIN_DISTRIB_EXTERNAL:= Makefile.in configure.ac configure #PLUGIN_NO_DEFAULT_TEST := no PLUGIN_TESTS_DIRS := string stdlib options api plugin +PLUGIN_DISTRIB_TESTS := \ + $(foreach dir, $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \ + $(dir)/oracle/* \ + $(filter-out result oracle,$(dir)/*)) \ + ) \ + $(filter-out result oracle,tests/*)) \ + $(foreach dir, tests $(addprefix tests/,$(PLUGIN_TESTS_DIRS)), \ + $(dir)/test_config) ################ # Generic part # diff --git a/src/plugins/instantiate/tests/options/test_config b/src/plugins/instantiate/tests/options/test_config index 01d3ae76752..b5a180b5436 100644 --- a/src/plugins/instantiate/tests/options/test_config +++ b/src/plugins/instantiate/tests/options/test_config @@ -1 +1 @@ -OPT: @PTEST_FILE@ -instantiate -print \ No newline at end of file +OPT: @PTEST_FILE@ -instantiate -print diff --git a/src/plugins/instantiate/tests/plugin/ast_clear.c b/src/plugins/instantiate/tests/plugin/ast_clear.c index d3dfbb6ad2a..7efc3990bd0 100644 --- a/src/plugins/instantiate/tests/plugin/ast_clear.c +++ b/src/plugins/instantiate/tests/plugin/ast_clear.c @@ -6,4 +6,4 @@ int foo(char* s1, char* s2, size_t len){ return memcmp(s1, s2, len) ; -} \ No newline at end of file +} diff --git a/src/plugins/instantiate/tests/plugin/function_pointers.i b/src/plugins/instantiate/tests/plugin/function_pointers.i index 8f27dd1ab18..b40b49be87b 100644 --- a/src/plugins/instantiate/tests/plugin/function_pointers.i +++ b/src/plugins/instantiate/tests/plugin/function_pointers.i @@ -3,4 +3,4 @@ */ void foo(void (* bar)()){ (*bar)(); -} \ No newline at end of file +} diff --git a/src/plugins/instantiate/tests/stdlib/calloc.c b/src/plugins/instantiate/tests/stdlib/calloc.c index d87508ad415..6b100ff812e 100644 --- a/src/plugins/instantiate/tests/stdlib/calloc.c +++ b/src/plugins/instantiate/tests/stdlib/calloc.c @@ -23,4 +23,4 @@ int main(void){ struct Flex* f = calloc(1, sizeof(struct Flex) + 3 * sizeof(int)) ; void *v = calloc(10, sizeof(char)); struct incomplete* inc = calloc(10, 10); -} \ No newline at end of file +} diff --git a/src/plugins/instantiate/tests/stdlib/free.c b/src/plugins/instantiate/tests/stdlib/free.c index e61ed8864c1..f2786b05cb0 100644 --- a/src/plugins/instantiate/tests/stdlib/free.c +++ b/src/plugins/instantiate/tests/stdlib/free.c @@ -14,4 +14,4 @@ void with_void(void * x){ } void with_incomplete(struct incomplete* t){ free(t); -} \ No newline at end of file +} diff --git a/src/plugins/instantiate/tests/stdlib/malloc.c b/src/plugins/instantiate/tests/stdlib/malloc.c index 00a07820a9a..70fab21bc47 100644 --- a/src/plugins/instantiate/tests/stdlib/malloc.c +++ b/src/plugins/instantiate/tests/stdlib/malloc.c @@ -22,4 +22,4 @@ int main(void){ struct Flex* f = malloc(sizeof(struct Flex) + 3 * sizeof(int)) ; void *v = malloc(sizeof(char) * 10); struct incomplete* inc = malloc(10); -} \ No newline at end of file +} -- GitLab