diff options
| author | Christophe Milard <christophe.milard@linaro.org> | 2015-07-09 11:25:32 +0200 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2015-07-10 11:29:18 +0300 |
| commit | 9b54f9b0c077ca7f1ae7caf9532cccc90cc04071 (patch) | |
| tree | 17f9761731952b024ed378813939f3b2854c74cf /test/validation | |
| parent | 40bee6bb8c308458696d56f647604128a57a6c3d (diff) | |
validation: removed main function from cunit_common
Now that all modules defines their own main(), the dual
library builds for cunit_common (one with main(), the other without)
is no longer needed. It is therefore removed.
Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
Reviewed-by: Stuart Haslam <stuart.haslam@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to 'test/validation')
| -rw-r--r-- | test/validation/common/Makefile.am | 8 | ||||
| -rw-r--r-- | test/validation/common/odp_cunit_common.c | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/test/validation/common/Makefile.am b/test/validation/common/Makefile.am index bd2f2147e..5548c523e 100644 --- a/test/validation/common/Makefile.am +++ b/test/validation/common/Makefile.am @@ -1,10 +1,6 @@ AUTOMAKE_OPTIONS = foreign include $(top_srcdir)/test/Makefile.inc -#libcunit_common_as_main.a is meant to be removed when all tests define -#their own main -noinst_LIBRARIES = libcunit_common.a libcunit_common_as_main.a -libcunit_common_a_CFLAGS = $(AM_CFLAGS) -DMODULE_HAS_OWN_MAIN +noinst_LIBRARIES = libcunit_common.a +libcunit_common_a_CFLAGS = $(AM_CFLAGS) libcunit_common_a_SOURCES = odp_cunit_common.c -libcunit_common_as_main_a_CFLAGS = $(AM_CFLAGS) -libcunit_common_as_main_a_SOURCES = odp_cunit_common.c diff --git a/test/validation/common/odp_cunit_common.c b/test/validation/common/odp_cunit_common.c index 56493ac69..f0752c62a 100644 --- a/test/validation/common/odp_cunit_common.c +++ b/test/validation/common/odp_cunit_common.c @@ -121,11 +121,3 @@ int odp_cunit_run(CU_SuiteInfo testsuites[]) return (ret) ? -1 : 0; } - -/* this is left for old style main declartion. will be removed soon */ -#ifndef MODULE_HAS_OWN_MAIN -int main(void) -{ - return odp_cunit_run(odp_testsuites); -} -#endif |