From dbc406795794739f5766e92ead37509e408cd068 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Sun, 19 Dec 2010 08:56:06 +0100
Subject: [PATCH] test directory reorganization

---
 .hgignore                                         |  1 +
 Makefile                                          | 15 +++++----------
 pvAccessApp/Makefile                              |  4 ++--
 testApp/Makefile                                  |  5 +++++
 .../testClient => testApp/client}/Makefile        |  0
 .../client}/testChannelAccessFactory.cpp          |  0
 {pvAccessApp/testUtils => testApp/utils}/Makefile |  0
 .../testUtils => testApp/utils}/arrayFIFOTest.cpp |  0
 .../utils}/growingCircularBufferTest.cpp          |  0
 .../testUtils => testApp/utils}/hexDumpTest.cpp   |  0
 .../utils}/inetAddressUtilsTest.cpp               |  0
 .../testUtils => testApp/utils}/loggerTest.cpp    |  0
 .../utils}/wildcharMatcherTest.cpp                |  0
 13 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 .hgignore
 create mode 100644 testApp/Makefile
 rename {pvAccessApp/testClient => testApp/client}/Makefile (100%)
 rename {pvAccessApp/testClient => testApp/client}/testChannelAccessFactory.cpp (100%)
 rename {pvAccessApp/testUtils => testApp/utils}/Makefile (100%)
 rename {pvAccessApp/testUtils => testApp/utils}/arrayFIFOTest.cpp (100%)
 rename {pvAccessApp/testUtils => testApp/utils}/growingCircularBufferTest.cpp (100%)
 rename {pvAccessApp/testUtils => testApp/utils}/hexDumpTest.cpp (100%)
 rename {pvAccessApp/testUtils => testApp/utils}/inetAddressUtilsTest.cpp (100%)
 rename {pvAccessApp/testUtils => testApp/utils}/loggerTest.cpp (100%)
 rename {pvAccessApp/testUtils => testApp/utils}/wildcharMatcherTest.cpp (100%)

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..c11a796
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1 @@
+QtC-pvAccess.creator.user
diff --git a/Makefile b/Makefile
index f0d9ad7..10141ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,11 @@
 #Makefile at top of application tree
 TOP = .
 include $(TOP)/configure/CONFIG
-DIRS := $(DIRS) $(filter-out $(DIRS), configure)
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *App))
-DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard iocBoot))
-
-define DIR_template
- $(1)_DEPEND_DIRS = configure
-endef
-$(foreach dir, $(filter-out configure,$(DIRS)),$(eval $(call DIR_template,$(dir))))
-
-iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
+DIRS += configure
+DIRS += pvAccessApp
+pvAccessApp_DEPEND_DIRS = configure
+DIRS += testApp
+testApp_DEPEND_DIRS = pvAccessApp
 
 include $(TOP)/configure/RULES_TOP
 
diff --git a/pvAccessApp/Makefile b/pvAccessApp/Makefile
index 5990db0..70f50c9 100644
--- a/pvAccessApp/Makefile
+++ b/pvAccessApp/Makefile
@@ -1,8 +1,8 @@
 TOP = ..
 include $(TOP)/configure/CONFIG
 DIRS += ca
-DIRS += utils testUtils
-DIRS += client testClient #server
+DIRS += utils
+DIRS += client #server
 #DIRS += localImpl remoteClientImpl remoteServerImpl
 #DIRS += localImplTest remoteImplTest
 include $(TOP)/configure/RULES_DIRS
diff --git a/testApp/Makefile b/testApp/Makefile
new file mode 100644
index 0000000..700bd55
--- /dev/null
+++ b/testApp/Makefile
@@ -0,0 +1,5 @@
+TOP = ..
+include $(TOP)/configure/CONFIG
+DIRS += utils
+DIRS += client
+include $(TOP)/configure/RULES_DIRS
diff --git a/pvAccessApp/testClient/Makefile b/testApp/client/Makefile
similarity index 100%
rename from pvAccessApp/testClient/Makefile
rename to testApp/client/Makefile
diff --git a/pvAccessApp/testClient/testChannelAccessFactory.cpp b/testApp/client/testChannelAccessFactory.cpp
similarity index 100%
rename from pvAccessApp/testClient/testChannelAccessFactory.cpp
rename to testApp/client/testChannelAccessFactory.cpp
diff --git a/pvAccessApp/testUtils/Makefile b/testApp/utils/Makefile
similarity index 100%
rename from pvAccessApp/testUtils/Makefile
rename to testApp/utils/Makefile
diff --git a/pvAccessApp/testUtils/arrayFIFOTest.cpp b/testApp/utils/arrayFIFOTest.cpp
similarity index 100%
rename from pvAccessApp/testUtils/arrayFIFOTest.cpp
rename to testApp/utils/arrayFIFOTest.cpp
diff --git a/pvAccessApp/testUtils/growingCircularBufferTest.cpp b/testApp/utils/growingCircularBufferTest.cpp
similarity index 100%
rename from pvAccessApp/testUtils/growingCircularBufferTest.cpp
rename to testApp/utils/growingCircularBufferTest.cpp
diff --git a/pvAccessApp/testUtils/hexDumpTest.cpp b/testApp/utils/hexDumpTest.cpp
similarity index 100%
rename from pvAccessApp/testUtils/hexDumpTest.cpp
rename to testApp/utils/hexDumpTest.cpp
diff --git a/pvAccessApp/testUtils/inetAddressUtilsTest.cpp b/testApp/utils/inetAddressUtilsTest.cpp
similarity index 100%
rename from pvAccessApp/testUtils/inetAddressUtilsTest.cpp
rename to testApp/utils/inetAddressUtilsTest.cpp
diff --git a/pvAccessApp/testUtils/loggerTest.cpp b/testApp/utils/loggerTest.cpp
similarity index 100%
rename from pvAccessApp/testUtils/loggerTest.cpp
rename to testApp/utils/loggerTest.cpp
diff --git a/pvAccessApp/testUtils/wildcharMatcherTest.cpp b/testApp/utils/wildcharMatcherTest.cpp
similarity index 100%
rename from pvAccessApp/testUtils/wildcharMatcherTest.cpp
rename to testApp/utils/wildcharMatcherTest.cpp