Merge branch '7.0' into PSI-7.0

modules/database/test/std/rec/Makefile

@@ -221,29 +221,27 @@ testHarness_SRCS += linkFilterTest.c
 TESTFILES += ../linkFilterTest.db
 TESTS += linkFilterTest
 
-# These are compile-time tests, no need to link or run
-TARGETS += dbHeaderTest$(OBJ)
-TARGET_SRCS += dbHeaderTest.cpp
-TARGETS += dbHeaderTestxx$(OBJ)
-TARGET_SRCS += dbHeaderTestxx.cpp
-
 TARGETS += $(COMMON_DIR)/epicsExportTestIoc.dbd
 DBDDEPENDS_FILES += epicsExportTestIoc.dbd$(DEP)
 epicsExportTestIoc_DBD += base.dbd
 epicsExportTestIoc_DBD += epicsExportTest.dbd
 TESTFILES += $(COMMON_DIR)/epicsExportTestIoc.dbd ../epicsExportTest.db
+
 TESTLIBRARY += epicsExportTestLib
 epicsExportTestLib_SRCS += epicsExportTest.c
 epicsExportTestLib_LIBS += dbCore Com
+
 TESTPROD_HOST += epicsExportTest
 TESTS += epicsExportTest
 TARGETS += epicsExportTest$(OBJ)
 epicsExportTest_SRCS += epicsExportTestMain.c
 epicsExportTest_SRCS += epicsExportTestIoc_registerRecordDeviceDriver.cpp
 epicsExportTest_LIBS = epicsExportTestLib
+
 TESTLIBRARY += epicsExportTestxxLib
 epicsExportTestxxLib_SRCS += epicsExportTestxx.cpp
 epicsExportTestxxLib_LIBS += dbCore Com
+
 TESTPROD_HOST += epicsExportTestxx
 TESTS += epicsExportTestxx
 TARGETS += epicsExportTestxx$(OBJ)
@@ -251,6 +249,12 @@ epicsExportTestxx_SRCS += epicsExportTestMain.c
 epicsExportTestxx_SRCS += epicsExportTestIoc_registerRecordDeviceDriver.cpp
 epicsExportTestxx_LIBS = epicsExportTestxxLib
 
+# These are compile-time tests, no need to link or run
+TARGETS += dbHeaderTest$(OBJ)
+TARGET_SRCS += dbHeaderTest.cpp
+TARGETS += dbHeaderTestxx$(OBJ)
+TARGET_SRCS += dbHeaderTestxx.cpp
+
 ifeq ($(T_A),$(EPICS_HOST_ARCH))
 # Host-only tests of softIoc/softIocPVA, caget and pvget (if present)
 # Unfortunately hangs too often on CI systems:

modules/database/test/std/rec/epicsExportTestMain.c

@@ -16,7 +16,10 @@
 #include <iocsh.h>
 #include <epicsExport.h>
 
-void epicsExportTestIoc_registerRecordDeviceDriver(struct dbBase *);
+#ifdef __cplusplus
+extern "C"
+#endif
+int epicsExportTestIoc_registerRecordDeviceDriver(struct dbBase *);
 
 static int* testVarEquals(const char* name, int expected)
 {
@@ -41,10 +44,10 @@ MAIN(epicsExportTest)
 {
     int *p1, *p2;
 
-    testPlan(30);
+    testPlan(31);
     testdbPrepare();
     testdbReadDatabase("epicsExportTestIoc.dbd", 0, 0);
-    epicsExportTestIoc_registerRecordDeviceDriver(pdbbase);
+    testOk(epicsExportTestIoc_registerRecordDeviceDriver(pdbbase)==0, "registerRecordDeviceDriver");
 
     testDiag("Testing if dsets and functions are found");
     testdbReadDatabase("epicsExportTest.db", 0, 0);