From 32bee9b2a5b75c0ad507ec9aa8bd53e98ce5925a Mon Sep 17 00:00:00 2001
From: "ben.franksen" <ben.franksen@online.de>
Date: Mon, 28 Mar 2011 22:55:01 +0000
Subject: [PATCH] test: renamed softIoc to seqSoftIoc to avoid conflict with
base
---
test/validate/Makefile | 10 +++++-----
test/validate/seqMain.c | 14 +++++++-------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/test/validate/Makefile b/test/validate/Makefile
index 0eae1973..10d3ef0e 100644
--- a/test/validate/Makefile
+++ b/test/validate/Makefile
@@ -35,17 +35,17 @@ PROD += eftest
#PROD += ctest
# Libraries
-PROD_LIBS += softIoc
+PROD_LIBS += seqSoftIoc
PROD_LIBS += seq
PROD_LIBS += pv
PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
-LIBRARY += softIoc
+LIBRARY += seqSoftIoc
-DBD += softIoc.dbd
-softIoc_DBD += base.dbd
+DBD += seqSoftIoc.dbd
+seqSoftIoc_DBD += base.dbd
-softIoc_SRCS += softIoc_registerRecordDeviceDriver.cpp
+seqSoftIoc_SRCS += seqSoftIoc_registerRecordDeviceDriver.cpp
DB_INSTALLS += syncq.db
DB_INSTALLS += pvGetComplete.db
diff --git a/test/validate/seqMain.c b/test/validate/seqMain.c
index 4bfff06f..1e647d7e 100644
--- a/test/validate/seqMain.c
+++ b/test/validate/seqMain.c
@@ -14,12 +14,12 @@
/* Usage:
* <test-program>
- * [-D softIoc.dbd] [-h] [-S] [-s] [-a ascf]
+ * [-D seqSoftIoc.dbd] [-h] [-S] [-s] [-a ascf]
* [-m macro=value,macro2=value2] [-d <test-program>.db]
* [st.cmd]
*
* If used the -D option must come first, and specify the
- * path to the softIoc.dbd file. The compile-time install
+ * path to the seqSoftIoc.dbd file. The compile-time install
* location is saved in the binary as a default.
*
* Usage information will be printed if -h is given, then
@@ -65,18 +65,18 @@
#include "iocInit.h"
#include "iocsh.h"
-extern int softIoc_registerRecordDeviceDriver(struct dbBase *pdbbase);
+extern int seqSoftIoc_registerRecordDeviceDriver(struct dbBase *pdbbase);
-#define DBD_FILE "dbd/softIoc.dbd"
+#define DBD_FILE "dbd/seqSoftIoc.dbd"
const char *arg0;
const char *base_dbd = DBD_FILE;
static void usage(int status) {
- printf("Usage: %s [-D softIoc.dbd] [-h] [-S] [-a ascf]\n", arg0);
+ printf("Usage: %s [-D seqSoftIoc.dbd] [-h] [-S] [-a ascf]\n", arg0);
puts("\t[-m macro=value,macro2=value2] [-d file.db]");
puts("\t[-x prefix] [st.cmd]");
- puts("Compiled-in path to softIoc.dbd is:");
+ puts("Compiled-in path to seqSoftIoc.dbd is:");
printf("\t%s\n", base_dbd);
epicsExit(status);
}
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
epicsExit(EXIT_FAILURE);
}
- softIoc_registerRecordDeviceDriver(pdbbase);
+ seqSoftIoc_registerRecordDeviceDriver(pdbbase);
seqRegisterSequencerProgram(&PROG_NAME);
if (startIocsh) {
--
GitLab