Fix #266: Rename "vxworks-ng" and "posix-ng" coverage tests

Rename to "vxworks" and "posix", respectively, to match the actual implementation names. The build scripts rely on the name being the same and will fail if different. This also updates the default build to be vxworks rather than vxworks6, if not specified on the command line.
nasa · Oct 21, 2019 · 89fec29 · 89fec29
1 parent ad88aa1
commit 89fec29
Show file tree

Hide file tree

Showing 131 changed files with 1 addition and 20,429 deletions.
diff --git a/src/unit-test-coverage/CMakeLists.txt b/src/unit-test-coverage/CMakeLists.txt
@@ -43,7 +43,7 @@ set(OSALCOVERAGE_USER_C_FLAGS "$ENV{OSALCOVERAGE_USER_C_FLAGS}" CACHE STRING "Us
 # The currently supported setup is to use the "pc-linux" BSP to execute the "vxworks6" 
 # code coverage analysis.  Because the actual underlying OS calls are stubbed out, there
 # is no dependency on the actual underlying OS.
-set(OSALCOVERAGE_TARGET_OSTYPE "vxworks6" CACHE STRING "OSAL target(s) to build coverage tests for")
+set(OSALCOVERAGE_TARGET_OSTYPE "vxworks;shared" CACHE STRING "OSAL target(s) to build coverage tests for")
 set(OSALCOVERAGE_HOST_BSPTYPE "pc-linux" CACHE STRING "OSAL unit test BSP to execute coverage tests")
 
 # OSALCOVERAGE_SYSTEM_OSTYPE indicates which of the BSP packages to include

diff --git a/...nit-test-coverage/posix-ng/CMakeLists.txt → src/unit-test-coverage/posix/CMakeLists.txt b/...nit-test-coverage/posix-ng/CMakeLists.txt → src/unit-test-coverage/posix/CMakeLists.txt
diff --git a/...-coverage/posix-ng/modules/CMakeLists.txt → ...est-coverage/posix/modules/CMakeLists.txt b/...-coverage/posix-ng/modules/CMakeLists.txt → ...est-coverage/posix/modules/CMakeLists.txt
diff --git a/...t-test-coverage/posix-ng/modules/Makefile → ...unit-test-coverage/posix/modules/Makefile b/...t-test-coverage/posix-ng/modules/Makefile → ...unit-test-coverage/posix/modules/Makefile
diff --git a/...test-coverage/posix-ng/modules/README.txt → ...it-test-coverage/posix/modules/README.txt b/...test-coverage/posix-ng/modules/README.txt → ...it-test-coverage/posix/modules/README.txt
diff --git a/...e/posix-ng/modules/src/stub-map-to-real.h → ...rage/posix/modules/src/stub-map-to-real.h b/...e/posix-ng/modules/src/stub-map-to-real.h → ...rage/posix/modules/src/stub-map-to-real.h
diff --git a/...-coverage/posix-ng/modules/src/ut-osapi.c → ...est-coverage/posix/modules/src/ut-osapi.c b/...-coverage/posix-ng/modules/src/ut-osapi.c → ...est-coverage/posix/modules/src/ut-osapi.c
diff --git a/...overage/posix-ng/src/coveragetest-osapi.c → ...t-coverage/posix/src/coveragetest-osapi.c b/...overage/posix-ng/src/coveragetest-osapi.c → ...t-coverage/posix/src/coveragetest-osapi.c
diff --git a/...coverage/posix-ng/ut-stubs/CMakeLists.txt → ...st-coverage/posix/ut-stubs/CMakeLists.txt b/...coverage/posix-ng/ut-stubs/CMakeLists.txt → ...st-coverage/posix/ut-stubs/CMakeLists.txt
diff --git a/...-ng/ut-stubs/src/osapi-impl-posix-stubs.c → ...six/ut-stubs/src/osapi-impl-posix-stubs.c b/...-ng/ut-stubs/src/osapi-impl-posix-stubs.c → ...six/ut-stubs/src/osapi-impl-posix-stubs.c
diff --git a/...t-test-coverage/vxworks-ng/CMakeLists.txt → ...unit-test-coverage/vxworks/CMakeLists.txt b/...t-test-coverage/vxworks-ng/CMakeLists.txt → ...unit-test-coverage/vxworks/CMakeLists.txt
diff --git a/...overage/vxworks-ng/modules/CMakeLists.txt → ...t-coverage/vxworks/modules/CMakeLists.txt b/...overage/vxworks-ng/modules/CMakeLists.txt → ...t-coverage/vxworks/modules/CMakeLists.txt
diff --git a/...test-coverage/vxworks-ng/modules/Makefile → ...it-test-coverage/vxworks/modules/Makefile b/...test-coverage/vxworks-ng/modules/Makefile → ...it-test-coverage/vxworks/modules/Makefile
diff --git a/...st-coverage/vxworks-ng/modules/README.txt → ...-test-coverage/vxworks/modules/README.txt b/...st-coverage/vxworks-ng/modules/README.txt → ...-test-coverage/vxworks/modules/README.txt
diff --git a/...overage/vxworks-ng/modules/inc/ut-osapi.h → ...t-coverage/vxworks/modules/inc/ut-osapi.h b/...overage/vxworks-ng/modules/inc/ut-osapi.h → ...t-coverage/vxworks/modules/inc/ut-osapi.h
diff --git a/...age/vxworks-ng/modules/inc/ut-osfileapi.h → ...verage/vxworks/modules/inc/ut-osfileapi.h b/...age/vxworks-ng/modules/inc/ut-osfileapi.h → ...verage/vxworks/modules/inc/ut-osfileapi.h
diff --git a/...age/vxworks-ng/modules/inc/ut-osfilesys.h → ...verage/vxworks/modules/inc/ut-osfilesys.h b/...age/vxworks-ng/modules/inc/ut-osfilesys.h → ...verage/vxworks/modules/inc/ut-osfilesys.h
diff --git a/...rage/vxworks-ng/modules/inc/ut-osloader.h → ...overage/vxworks/modules/inc/ut-osloader.h b/...rage/vxworks-ng/modules/inc/ut-osloader.h → ...overage/vxworks/modules/inc/ut-osloader.h
diff --git a/...erage/vxworks-ng/modules/inc/ut-ostimer.h → ...coverage/vxworks/modules/inc/ut-ostimer.h b/...erage/vxworks-ng/modules/inc/ut-ostimer.h → ...coverage/vxworks/modules/inc/ut-ostimer.h
diff --git a/...vxworks-ng/modules/src/stub-map-to-real.h → ...ge/vxworks/modules/src/stub-map-to-real.h b/...vxworks-ng/modules/src/stub-map-to-real.h → ...ge/vxworks/modules/src/stub-map-to-real.h
diff --git a/...overage/vxworks-ng/modules/src/ut-osapi.c → ...t-coverage/vxworks/modules/src/ut-osapi.c b/...overage/vxworks-ng/modules/src/ut-osapi.c → ...t-coverage/vxworks/modules/src/ut-osapi.c
diff --git a/...age/vxworks-ng/modules/src/ut-osfileapi.c → ...verage/vxworks/modules/src/ut-osfileapi.c b/...age/vxworks-ng/modules/src/ut-osfileapi.c → ...verage/vxworks/modules/src/ut-osfileapi.c
diff --git a/...age/vxworks-ng/modules/src/ut-osfilesys.c → ...verage/vxworks/modules/src/ut-osfilesys.c b/...age/vxworks-ng/modules/src/ut-osfilesys.c → ...verage/vxworks/modules/src/ut-osfilesys.c
diff --git a/...rage/vxworks-ng/modules/src/ut-osloader.c → ...overage/vxworks/modules/src/ut-osloader.c b/...rage/vxworks-ng/modules/src/ut-osloader.c → ...overage/vxworks/modules/src/ut-osloader.c
diff --git a/...erage/vxworks-ng/modules/src/ut-ostimer.c → ...coverage/vxworks/modules/src/ut-ostimer.c b/...erage/vxworks-ng/modules/src/ut-ostimer.c → ...coverage/vxworks/modules/src/ut-ostimer.c
diff --git a/...erage/vxworks-ng/src/coveragetest-osapi.c → ...coverage/vxworks/src/coveragetest-osapi.c b/...erage/vxworks-ng/src/coveragetest-osapi.c → ...coverage/vxworks/src/coveragetest-osapi.c
diff --git a/...e/vxworks-ng/src/coveragetest-osfileapi.c → ...rage/vxworks/src/coveragetest-osfileapi.c b/...e/vxworks-ng/src/coveragetest-osfileapi.c → ...rage/vxworks/src/coveragetest-osfileapi.c
diff --git a/...e/vxworks-ng/src/coveragetest-osfilesys.c → ...rage/vxworks/src/coveragetest-osfilesys.c b/...e/vxworks-ng/src/coveragetest-osfilesys.c → ...rage/vxworks/src/coveragetest-osfilesys.c
diff --git a/...ge/vxworks-ng/src/coveragetest-osloader.c → ...erage/vxworks/src/coveragetest-osloader.c b/...ge/vxworks-ng/src/coveragetest-osloader.c → ...erage/vxworks/src/coveragetest-osloader.c
diff --git a/...age/vxworks-ng/src/coveragetest-ostimer.c → ...verage/vxworks/src/coveragetest-ostimer.c b/...age/vxworks-ng/src/coveragetest-ostimer.c → ...verage/vxworks/src/coveragetest-ostimer.c
diff --git a/...e/vxworks-ng/src/coveragetest-posixfile.c → ...rage/vxworks/src/coveragetest-posixfile.c b/...e/vxworks-ng/src/coveragetest-posixfile.c → ...rage/vxworks/src/coveragetest-posixfile.c
diff --git a/...xworks-ng/src/coveragetest-posixgettime.c → ...e/vxworks/src/coveragetest-posixgettime.c b/...xworks-ng/src/coveragetest-posixgettime.c → ...e/vxworks/src/coveragetest-posixgettime.c
diff --git a/...age/vxworks-ng/src/coveragetest-posixio.c → ...verage/vxworks/src/coveragetest-posixio.c b/...age/vxworks-ng/src/coveragetest-posixio.c → ...verage/vxworks/src/coveragetest-posixio.c
diff --git a/...rage/vxworks-ng/src/coveragetest-printf.c → ...overage/vxworks/src/coveragetest-printf.c b/...rage/vxworks-ng/src/coveragetest-printf.c → ...overage/vxworks/src/coveragetest-printf.c
diff --git a/.../vxworks-ng/src/os-vxworks-coveragetest.h → ...age/vxworks/src/os-vxworks-coveragetest.h b/.../vxworks-ng/src/os-vxworks-coveragetest.h → ...age/vxworks/src/os-vxworks-coveragetest.h
diff --git a/...verage/vxworks-ng/ut-stubs/CMakeLists.txt → ...-coverage/vxworks/ut-stubs/CMakeLists.txt b/...verage/vxworks-ng/ut-stubs/CMakeLists.txt → ...-coverage/vxworks/ut-stubs/CMakeLists.txt
diff --git a/...g/ut-stubs/src/osapi-impl-vxworks-stubs.c → ...s/ut-stubs/src/osapi-impl-vxworks-stubs.c b/...g/ut-stubs/src/osapi-impl-vxworks-stubs.c → ...s/ut-stubs/src/osapi-impl-vxworks-stubs.c
diff --git a/src/unit-test-coverage/vxworks6/CMakeLists.txt b/src/unit-test-coverage/vxworks6/CMakeLists.txt
diff --git a/src/unit-test-coverage/vxworks6/Makefile b/src/unit-test-coverage/vxworks6/Makefile
diff --git a/src/unit-test-coverage/vxworks6/osapi-test/CMakeLists.txt b/src/unit-test-coverage/vxworks6/osapi-test/CMakeLists.txt
diff --git a/src/unit-test-coverage/vxworks6/osapi-test/Makefile b/src/unit-test-coverage/vxworks6/osapi-test/Makefile