updated test client app names to avoid conflicts

diff --git a/configure.ac b/configure.ac
index f193d20ebc840f82afada5255aa7d4b6104eafad..6ea030e019e4a05973fb097bdb47213f6ddbd10d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,6 @@ Makefile
 src/Makefile
 src_test/Makefile
 data/configs/Makefile
 src/Makefile
 src_test/Makefile
 data/configs/Makefile

-data/configs/test_client.service
-data/configs/test_client2.service
+data/configs/test_ha_client.service
+data/configs/test_ha_client2.service

 ])
 ])

diff --git a/data/configs/Makefile.am b/data/configs/Makefile.am
index 46237499bd73005554bd88616659204aba251e67..6c9cb49aee3e66434ac33ff7017df477809b1ce3 100644 (file)
--- a/data/configs/Makefile.am
+++ b/data/configs/Makefile.am
@@ -1,5 +1,5 @@
 configdir =  $(sysconfdir)/plp/ha
 configdir =  $(sysconfdir)/plp/ha

-config_in_files = test_client.service.in test_client2.service.in
+config_in_files = test_ha_client.service.in test_ha_client2.service.in

 config_DATA = $(config_in_files:.service.in=.service)
 EXTRA_DIST = $(config_in_files)
 DISTCLEANFILES = $(config_DATA) Makefile.in
 config_DATA = $(config_in_files:.service.in=.service)
 EXTRA_DIST = $(config_in_files)
 DISTCLEANFILES = $(config_DATA) Makefile.in

diff --git a/data/configs/test_client.service.in b/data/configs/test_client.service.in
deleted file mode 100644 (file)
index d85d75e..0000000
--- a/data/configs/test_client.service.in
+++ /dev/null
@@ -1,2 +0,0 @@
-config 'test_client' 'service'
-        option 'ExecStart' '@prefix@/bin/test_client'

diff --git a/data/configs/test_client2.service.in b/data/configs/test_client2.service.in
deleted file mode 100644 (file)
index bd4f582..0000000
--- a/data/configs/test_client2.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-config 'hello' 'service'
-        option 'ExecStart' '@prefix@/bin/test_client2'
-

diff --git a/data/configs/test_ha_client.service.in b/data/configs/test_ha_client.service.in
new file mode 100644 (file)
index 0000000..a61ef8b
--- /dev/null
+++ b/data/configs/test_ha_client.service.in
@@ -0,0 +1,2 @@
+config 'test_client' 'service'
+        option 'ExecStart' '@prefix@/bin/test_ha_client'

diff --git a/data/configs/test_ha_client2.service.in b/data/configs/test_ha_client2.service.in
new file mode 100644 (file)
index 0000000..bde01d8
--- /dev/null
+++ b/data/configs/test_ha_client2.service.in
@@ -0,0 +1,3 @@
+config 'hello' 'service'
+        option 'ExecStart' '@prefix@/bin/test_ha_client2'
+

diff --git a/src_test/Makefile.am b/src_test/Makefile.am
index 6b54771597ecf103b55dc739085ebc6d28dce37b..dbc6b2bd66df1f86db410412fe5cd0ee36bb88b6 100644 (file)
--- a/src_test/Makefile.am
+++ b/src_test/Makefile.am
@@ -1,13 +1,13 @@
-noinst_PROGRAMS = test_ha test_client test_client2
+noinst_PROGRAMS = test_ha test_ha_client test_ha_client2

 
 test_ha_SOURCES = test_ha.c
 test_ha_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a
 
 
 test_ha_SOURCES = test_ha.c
 test_ha_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a
 

-test_client_SOURCES = test_client.c
-test_client_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a
+test_ha_client_SOURCES = test_client.c
+test_ha_client_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a

 
 

-test_client2_SOURCES = test_client.c
-test_client2_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a
+test_ha_client2_SOURCES = test_client.c
+test_ha_client2_LDADD = $(SRC_LIBS) ../src/.libs/libplpha.a

 
 AM_CPPFLAGS = $(SRC_CFLAGS) -I../src
 
 
 AM_CPPFLAGS = $(SRC_CFLAGS) -I../src