Move tests around

qa/CMakeLists.txt

@@ -19,23 +19,7 @@
 # or you may write to the Free Software Foundation, Inc.,
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-include(KiCadQABuildUtils)
+include( KiCadQABuildUtils )
-
-if( KICAD_TEST_XML_OUTPUT )
-    # To do this, you will need xmlrunner
-    set( PY_TEST_ARGS --xml=${CMAKE_CURRENT_BINARY_DIR}/python.xunit-results )
-endif()
-
-# Test that runs the QA tests through scripting
-add_test( NAME qa_python
-    COMMAND ${PYTHON_EXECUTABLE} test.py ${PY_TEST_ARGS}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-
-set_property( TEST qa_python
-    PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/pcbnew${PYTHON_QA_PATH}"
-)
 
 # Shared QA helper libraries
 add_subdirectory( qa_utils )
@@ -43,7 +27,7 @@ add_subdirectory( pcbnew_utils )
 add_subdirectory( schematic_utils )
 
 # Unit tests
-add_subdirectory( unittests )
+add_subdirectory( tests )
 
 # Utility/debugging/profiling programs
 add_subdirectory( tools )

qa/tests/CMakeLists.txt

@@ -29,3 +29,18 @@ add_subdirectory( pcbnew )
 if( KICAD_SPICE_QA )
     add_subdirectory( spice )
 endif()
+
+if( KICAD_TEST_XML_OUTPUT )
+    # To do this, you will need xmlrunner
+    set( PY_TEST_ARGS --xml=${CMAKE_CURRENT_BINARY_DIR}/python.xunit-results )
+endif()
+
+# Test that runs the QA tests through scripting
+add_test( NAME qa_python
+    COMMAND ${PYTHON_EXECUTABLE} test-pcbnewswig.py ${PY_TEST_ARGS}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set_property( TEST qa_python
+    PROPERTY ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/pcbnew${PYTHON_QA_PATH}"
+)

qa/tests/eeschema/CMakeLists.txt

@@ -46,8 +46,8 @@ set( QA_EESCHEMA_SRCS
     test_sch_biu.cpp
 
     # Shared between programs, but dependent on the BIU
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_format_units.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_format_units.cpp
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_array_options.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_array_options.cpp
 
     sch_plugins/altium/test_altium_parser_sch.cpp
 

qa/tests/gerbview/CMakeLists.txt

@@ -25,7 +25,7 @@ set( QA_GERBVIEW_SRCS
     test_module.cpp
 
     # Shared between programs, but dependent on the BIU
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_format_units.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_format_units.cpp
 )
 
 if( WIN32 )

qa/tests/pcbnew/CMakeLists.txt

@@ -24,8 +24,8 @@ set( QA_PCBNEW_SRCS
     test_module.cpp
 
     # Shared between programs, but dependent on the BIU
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_format_units.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_format_units.cpp
-    ${CMAKE_SOURCE_DIR}/qa/unittests/common/test_array_options.cpp
+    ${CMAKE_SOURCE_DIR}/qa/tests/common/test_array_options.cpp
 
     # testing utility routines
     drc/drc_test_utils.cpp