[#1775] move TLS test to shell library

diff --git a/configure.ac b/configure.ac
index 4bc092f46ce4c037490200ed904b244c34406d82..ac7b0743b6f9bd06f11b3655731f8a60269eae0a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1412,7 +1412,7 @@ fi
 # Decide if the control agent TLS test can work.
 ca_tls_test=no
 if test "x$enable_shell" != "xno"; then
-  major=` echo $PYTHON_VERSION | cut -d '.' -f 1`
+  major=$(echo $PYTHON_VERSION | cut -d '.' -f 1)
   if test "x$major" = "x3"; then
     ca_tls_test="$tls_support"
   else
@@ -1637,8 +1637,6 @@ AC_CONFIG_FILES([src/bin/agent/tests/ca_process_tests.sh],
 AC_CONFIG_FILES([src/bin/agent/tests/test_basic_auth_libraries.h])
 AC_CONFIG_FILES([src/bin/agent/tests/test_callout_libraries.h])
 AC_CONFIG_FILES([src/bin/agent/tests/test_data_files_config.h])
-AC_CONFIG_FILES([src/bin/agent/tests/tls_ca_process_tests.sh],
-                [chmod +x src/bin/agent/tests/tls_ca_process_tests.sh])
 AC_CONFIG_FILES([src/bin/d2/Makefile])
 AC_CONFIG_FILES([src/bin/d2/tests/Makefile])
 AC_CONFIG_FILES([src/bin/d2/tests/d2_process_tests.sh],
@@ -1687,6 +1685,8 @@ AC_CONFIG_FILES([src/bin/shell/tests/shell_process_tests.sh],
                 [chmod +x src/bin/shell/tests/shell_process_tests.sh])
 AC_CONFIG_FILES([src/bin/shell/tests/shell_unittest.py],
                 [chmod +x src/bin/shell/tests/shell_unittest.py])
+AC_CONFIG_FILES([src/bin/shell/tests/tls_ca_process_tests.sh],
+                [chmod +x src/bin/shell/tests/tls_ca_process_tests.sh])
 AC_CONFIG_FILES([src/hooks/Makefile])
 AC_CONFIG_FILES([src/hooks/dhcp/Makefile])
 AC_CONFIG_FILES([src/hooks/dhcp/bootp/Makefile])

diff --git a/src/bin/agent/tests/.gitignore b/src/bin/agent/tests/.gitignore
index 6ed6cdec7cfd24a6d6790af139d443a921e16f4c..63fdc3d2f0783c84e76f5580e6a988844890fca1 100644 (file)
--- a/src/bin/agent/tests/.gitignore
+++ b/src/bin/agent/tests/.gitignore
@@ -3,4 +3,3 @@
 /test_basic_auth_libraries.h
 /test_callout_libraries.h
 /test_data_files_config.h
-/tls_ca_process_tests.sh

diff --git a/src/bin/agent/tests/Makefile.am b/src/bin/agent/tests/Makefile.am
index 5c6cb362458650ed505025869ebe916dbea0f1ed..722095eaa714118e9297bf33a7efff63af6ea0c0 100644 (file)
--- a/src/bin/agent/tests/Makefile.am
+++ b/src/bin/agent/tests/Makefile.am
@@ -2,13 +2,10 @@ SHTESTS =
 # The test of dynamic reconfiguration based on signals will work only
 # if we are using file based configuration approach.
 SHTESTS += ca_process_tests.sh
-if CA_TLS_TEST
-SHTESTS += tls_ca_process_tests.sh
-endif
 
-noinst_SCRIPTS = ca_process_tests.sh tls_ca_process_tests.sh
+noinst_SCRIPTS = ca_process_tests.sh
 
-EXTRA_DIST  = ca_process_tests.sh.in tls_ca_process_tests.sh.in
+EXTRA_DIST  = ca_process_tests.sh.in
 EXTRA_DIST += testdata/get_config.json
 
 # test using command-line arguments, so use check-local target instead of TESTS

diff --git a/src/bin/shell/tests/.gitignore b/src/bin/shell/tests/.gitignore
index e2028da5763b5ff51d46789f53018184184dae3e..f376965840e5b7e262e785ceae29d9e3d94517d5 100644 (file)
--- a/src/bin/shell/tests/.gitignore
+++ b/src/bin/shell/tests/.gitignore
@@ -1,3 +1,4 @@
 /basic_auth_tests.sh
 /shell_process_tests.sh
 /shell_unittest.py
+/tls_ca_process_tests.sh

diff --git a/src/bin/shell/tests/Makefile.am b/src/bin/shell/tests/Makefile.am
index 118688578221ba07d142e6ad1f2107482cf99079..be4c6038a72df60fe3d72bb33de1165c88ffa59d 100644 (file)
--- a/src/bin/shell/tests/Makefile.am
+++ b/src/bin/shell/tests/Makefile.am
@@ -1,8 +1,15 @@
 PYTESTS = shell_unittest.py
-SHTESTS = shell_process_tests.sh basic_auth_tests.sh
+
+SHTESTS =
+SHTESTS += basic_auth_tests.sh
+SHTESTS += shell_process_tests.sh
+if CA_TLS_TEST
+SHTESTS += tls_ca_process_tests.sh
+endif
+
 noinst_SCRIPTS = $(PYTESTS) $(SHTESTS)
 
-DISTCLEANFILES = basic_auth_tests.sh shell_process_tests.sh shell_unittest.py
+DISTCLEANFILES = $(PYTESTS) $(SHTESTS)
 
 # test using command-line arguments, so use check-local target instead of TESTS
 check-local: check-shell check-python

diff --git a/src/bin/agent/tests/tls_ca_process_tests.sh.in b/src/bin/shell/tests/tls_ca_process_tests.sh.in
similarity index 100%
rename from src/bin/agent/tests/tls_ca_process_tests.sh.in
rename to src/bin/shell/tests/tls_ca_process_tests.sh.in