From 2b3701ab1c124adce760a8ee5db21bf437a0eab5 Mon Sep 17 00:00:00 2001 From: Matej Sekoranja Date: Tue, 9 Nov 2010 22:46:05 +0100 Subject: [PATCH] misc-s tests move to miscTest dir --- QtC-pvData.files | 6 ++--- pvDataApp/Makefile | 1 - pvDataApp/miscTest/Makefile | 16 +++++++++++++ .../{test => miscTest}/testBaseException.cpp | 0 pvDataApp/{test => miscTest}/testBitSet.cpp | 0 .../{test => miscTest}/testByteBuffer.cpp | 0 .../{test => miscTest}/testSerialization.cpp | 0 pvDataApp/test/Makefile | 24 ------------------- 8 files changed, 19 insertions(+), 28 deletions(-) rename pvDataApp/{test => miscTest}/testBaseException.cpp (100%) rename pvDataApp/{test => miscTest}/testBitSet.cpp (100%) rename pvDataApp/{test => miscTest}/testByteBuffer.cpp (100%) rename pvDataApp/{test => miscTest}/testSerialization.cpp (100%) delete mode 100644 pvDataApp/test/Makefile diff --git a/QtC-pvData.files b/QtC-pvData.files index 0947af9..41d4360 100644 --- 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 diff --git a/pvDataApp/Makefile b/pvDataApp/Makefile index 332ae59..3342815 100644 --- 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 diff --git a/pvDataApp/miscTest/Makefile b/pvDataApp/miscTest/Makefile index 73d4806..8835be7 100644 --- 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 diff --git a/pvDataApp/test/testBaseException.cpp b/pvDataApp/miscTest/testBaseException.cpp similarity index 100% rename from pvDataApp/test/testBaseException.cpp rename to pvDataApp/miscTest/testBaseException.cpp diff --git a/pvDataApp/test/testBitSet.cpp b/pvDataApp/miscTest/testBitSet.cpp similarity index 100% rename from pvDataApp/test/testBitSet.cpp rename to pvDataApp/miscTest/testBitSet.cpp diff --git a/pvDataApp/test/testByteBuffer.cpp b/pvDataApp/miscTest/testByteBuffer.cpp similarity index 100% rename from pvDataApp/test/testByteBuffer.cpp rename to pvDataApp/miscTest/testByteBuffer.cpp diff --git a/pvDataApp/test/testSerialization.cpp b/pvDataApp/miscTest/testSerialization.cpp similarity index 100% rename from pvDataApp/test/testSerialization.cpp rename to pvDataApp/miscTest/testSerialization.cpp diff --git a/pvDataApp/test/Makefile b/pvDataApp/test/Makefile deleted file mode 100644 index 7d795bd..0000000 --- a/pvDataApp/test/Makefile +++ /dev/null @@ -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 -