From a4d8d8b78781b9f511c50be0b557fc93d8d3a4b7 Mon Sep 17 00:00:00 2001
From: strangeqargo <“strangeqargo@gmail.com”>
Date: Fri, 10 Jun 2016 23:45:19 +0300
Subject: [PATCH] test_scripts dir added

---
 CMakeLists.txt                             |  1 +
 test_scripts/CMakeLists.txt                | 61 ++++++++++++++++++++++
 {tests => test_scripts}/ddl2cpp.cpp        |  0
 {tests => test_scripts}/sample_ddl2cpp.sql |  0
 tests/CMakeLists.txt                       | 26 ---------
 5 files changed, 62 insertions(+), 26 deletions(-)
 create mode 100644 test_scripts/CMakeLists.txt
 rename {tests => test_scripts}/ddl2cpp.cpp (100%)
 rename {tests => test_scripts}/sample_ddl2cpp.sql (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7767a8b..588002d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,4 +109,5 @@ add_subdirectory(test_types)
 add_subdirectory(test_serializer)
 add_subdirectory(test_static_asserts)
 add_subdirectory(test_constraints)
+add_subdirectory(test_scripts)
 add_subdirectory(examples)
diff --git a/test_scripts/CMakeLists.txt b/test_scripts/CMakeLists.txt
new file mode 100644
index 00000000..8daea82c
--- /dev/null
+++ b/test_scripts/CMakeLists.txt
@@ -0,0 +1,61 @@
+# Copyright (c) 2013-2016, Roland Bock, Alexey Elymanov
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#   Redistributions of source code must retain the above copyright notice, this
+#   list of conditions and the following disclaimer.
+#
+#   Redistributions in binary form must reproduce the above copyright notice, this
+#   list of conditions and the following disclaimer in the documentation and/or
+#   other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+include(FindPythonInterp)
+if (${PYTHONINTERP_FOUND})
+  message( STATUS "Python found: " ${PYTHON_EXECUTABLE} )
+
+  execute_process(
+          COMMAND ${PYTHON_EXECUTABLE} -c "import pyparsing"
+          RESULT_VARIABLE PythonRESULT
+          OUTPUT_VARIABLE PythonOUTPUT
+          ERROR_VARIABLE PythonERROR
+  )
+  if (${PythonRESULT})
+    message( STATUS "Pyparsing is not installed." ${PythonRESULT} )
+  else()
+    message( STATUS "Pyparsing is installed." )
+    message( STATUS "Enabling sql2ddl tests.")
+    set(test_scripts_names ddl2cpp)
+
+
+    create_test_sourcelist(test_scripts_sources test_scripts_main.cpp ${test_scripts_names})
+    add_executable(sqlpp11_test_scripts ${test_scripts_sources})
+    target_link_libraries(sqlpp11_test_scripts PRIVATE sqlpp11 sqlpp11_testing)
+
+    foreach(test_scripts IN LISTS test_scripts_names)
+      add_test(NAME sqlpp11.test_scripts.${test_scripts}
+              COMMAND sqlpp11_test_scripts ${test_scripts}
+              )
+    endforeach()
+
+  endif()
+  #MESSAGE( STATUS "Python found:" ${PythonRESULT} )
+  #MESSAGE( STATUS "Python found:" ${PythonOUTPUT} )
+  #MESSAGE( STATUS "Python found:" ${PythonERROR} )
+ENDIF()
+
+
+
diff --git a/tests/ddl2cpp.cpp b/test_scripts/ddl2cpp.cpp
similarity index 100%
rename from tests/ddl2cpp.cpp
rename to test_scripts/ddl2cpp.cpp
diff --git a/tests/sample_ddl2cpp.sql b/test_scripts/sample_ddl2cpp.sql
similarity index 100%
rename from tests/sample_ddl2cpp.sql
rename to test_scripts/sample_ddl2cpp.sql
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 72f773e4..df9335c6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -47,32 +47,6 @@ set(test_names
   With
   )
 
-include(FindPythonInterp)
-if (${PYTHONINTERP_FOUND})
-    message( STATUS "Python found: " ${PYTHON_EXECUTABLE} )
-
-    execute_process(
-        COMMAND ${PYTHON_EXECUTABLE} -c "import pyparsing"
-        RESULT_VARIABLE PythonRESULT
-        OUTPUT_VARIABLE PythonOUTPUT
-        ERROR_VARIABLE PythonERROR
-    )
-    if (${PythonRESULT})
-        message( STATUS "Pyparsing is not installed." ${PythonRESULT} )
-    else()
-        message( STATUS "Pyparsing is installed." )
-        message( STATUS "Enabling sql2ddl tests.")
-        set(test_names
-        ${test_names}
-                ddl2cpp
-        )
-    endif()
-    #MESSAGE( STATUS "Python found:" ${PythonRESULT} )
-    #MESSAGE( STATUS "Python found:" ${PythonOUTPUT} )
-    #MESSAGE( STATUS "Python found:" ${PythonERROR} )
-ENDIF()
-
-
 create_test_sourcelist(test_sources test_main.cpp ${test_names})
 add_executable(sqlpp11_tests ${test_sources})
 target_link_libraries(sqlpp11_tests PRIVATE sqlpp11 sqlpp11_testing)