misc-s tests move to miscTest dir

2010-11-09 22:46:05 +01:00
parent 5b4c642b5b
commit 2b3701ab1c
8 changed files with 19 additions and 28 deletions
--- a/QtC-pvData.files
+++ b/QtC-pvData.files
@@ -77,9 +77,9 @@ pvDataApp/test/testSimpleStructure.cpp
 pvDataApp/misc/epicsException.h
 pvDataApp/misc/byteBuffer.cpp
 pvDataApp/misc/bitSet.cpp
-pvDataApp/test/testByteBuffer.cpp
-pvDataApp/test/testBitSet.cpp
-pvDataApp/test/testBaseException.cpp
+pvDataApp/miscTest/testByteBuffer.cpp
+pvDataApp/miscTest/testBitSet.cpp
+pvDataApp/miscTest/testBaseException.cpp
 pvDataApp/misc/serializeHelper.h
 pvDataApp/misc/serializeHelper.cpp
 pvDataApp/pvTest/testIntrospect.cpp
--- a/pvDataApp/Makefile
+++ b/pvDataApp/Makefile
@@ -3,7 +3,6 @@ include $(TOP)/configure/CONFIG
 DIRS += misc
 DIRS += pv
 DIRS += factory
-DIRS += test
 DIRS += miscTest
 DIRS += pvTest
 include $(TOP)/configure/RULES_DIRS
--- a/pvDataApp/miscTest/Makefile
+++ b/pvDataApp/miscTest/Makefile
@@ -6,6 +6,22 @@ PROD_HOST += testLinkedList
 testLinkedList_SRCS += testLinkedList.cpp
 testLinkedList_LIBS += pvMisc Com

+PROD_HOST += testBitSet
+testBitSet_SRCS += testBitSet.cpp
+testBitSet_LIBS += pvMisc Com
+
+PROD_HOST += testByteBuffer
+testByteBuffer_SRCS += testByteBuffer.cpp
+testByteBuffer_LIBS += pvMisc Com
+
+PROD_HOST += testBaseException
+testBaseException_SRCS += testBaseException.cpp
+testBaseException_LIBS += pvMisc
+
+PROD_HOST += testSerialization
+testSerialization_SRCS += testSerialization.cpp
+testSerialization_LIBS += pvMisc pvFactory Com
+
 include $(TOP)/configure/RULES
 #----------------------------------------
 #  ADD RULES AFTER THIS LINE
--- a/pvDataApp/miscTest/testBaseException.cpp
+++ b/pvDataApp/miscTest/testBaseException.cpp
--- a/pvDataApp/miscTest/testBitSet.cpp
+++ b/pvDataApp/miscTest/testBitSet.cpp
--- a/pvDataApp/miscTest/testByteBuffer.cpp
+++ b/pvDataApp/miscTest/testByteBuffer.cpp
--- a/pvDataApp/miscTest/testSerialization.cpp
+++ b/pvDataApp/miscTest/testSerialization.cpp
--- a/pvDataApp/test/Makefile
+++ b/pvDataApp/test/Makefile
@@ -1,24 +0,0 @@
-TOP=../..
-
-include $(TOP)/configure/CONFIG
-
-PROD_HOST += testBitSet
-testBitSet_SRCS += testBitSet.cpp
-testBitSet_LIBS += pvMisc Com
-
-PROD_HOST += testByteBuffer
-testByteBuffer_SRCS += testByteBuffer.cpp
-testByteBuffer_LIBS += pvMisc Com
-
-PROD_HOST += testBaseException
-testBaseException_SRCS += testBaseException.cpp
-testBaseException_LIBS += pvMisc
-
-PROD_HOST += testSerialization
-testSerialization_SRCS += testSerialization.cpp
-testSerialization_LIBS += pvMisc pvFactory Com
-
-include $(TOP)/configure/RULES
-#----------------------------------------
-#  ADD RULES AFTER THIS LINE
-