From da295a355facb5607e38d3ff2ea0db4280cab8d2 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Wed, 9 Jan 2019 06:35:42 -0800 Subject: [PATCH] qa: Moving eeschema qa to main qa folder --- eeschema/CMakeLists.txt | 1 - qa/CMakeLists.txt | 1 + {eeschema/qa => qa/eeschema}/CMakeLists.txt | 6 +++++- .../data/eagle_schematics/eagle-import-testfile.brd | 0 .../data/eagle_schematics/eagle-import-testfile.sch | 0 {eeschema/qa => qa/eeschema}/data/fixtures_eagle_plugin.h | 0 {eeschema/qa => qa/eeschema}/test_basic.cpp | 0 {eeschema/qa => qa/eeschema}/test_module.cpp | 0 8 files changed, 6 insertions(+), 2 deletions(-) rename {eeschema/qa => qa/eeschema}/CMakeLists.txt (94%) rename {eeschema/qa => qa/eeschema}/data/eagle_schematics/eagle-import-testfile.brd (100%) rename {eeschema/qa => qa/eeschema}/data/eagle_schematics/eagle-import-testfile.sch (100%) rename {eeschema/qa => qa/eeschema}/data/fixtures_eagle_plugin.h (100%) rename {eeschema/qa => qa/eeschema}/test_basic.cpp (100%) rename {eeschema/qa => qa/eeschema}/test_module.cpp (100%) diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt index 57022c0995..20ecae6ad1 100644 --- a/eeschema/CMakeLists.txt +++ b/eeschema/CMakeLists.txt @@ -513,4 +513,3 @@ add_custom_target( add_dependencies( eeschema_kiface dialog_bom_cfg_lexer_source_files ) add_subdirectory( plugins ) -add_subdirectory( qa ) diff --git a/qa/CMakeLists.txt b/qa/CMakeLists.txt index e0011ff772..f44721628f 100644 --- a/qa/CMakeLists.txt +++ b/qa/CMakeLists.txt @@ -19,6 +19,7 @@ add_subdirectory( unit_test_utils ) # Unit tests add_subdirectory( common ) add_subdirectory( pcbnew ) +add_subdirectory( eeschema ) add_subdirectory( shape_poly_set_refactor ) # Utility/test programs diff --git a/eeschema/qa/CMakeLists.txt b/qa/eeschema/CMakeLists.txt similarity index 94% rename from eeschema/qa/CMakeLists.txt rename to qa/eeschema/CMakeLists.txt index fb99b86135..ef837fe7db 100644 --- a/eeschema/qa/CMakeLists.txt +++ b/qa/eeschema/CMakeLists.txt @@ -23,11 +23,15 @@ find_package( Boost COMPONENTS unit_test_framework REQUIRED ) + include_directories( BEFORE ${INC_BEFORE} ) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/eeschema + ${CMAKE_SOURCE_DIR}/common ${INC_AFTER} - ) +) add_executable( qa_eagle_plugin test_module.cpp diff --git a/eeschema/qa/data/eagle_schematics/eagle-import-testfile.brd b/qa/eeschema/data/eagle_schematics/eagle-import-testfile.brd similarity index 100% rename from eeschema/qa/data/eagle_schematics/eagle-import-testfile.brd rename to qa/eeschema/data/eagle_schematics/eagle-import-testfile.brd diff --git a/eeschema/qa/data/eagle_schematics/eagle-import-testfile.sch b/qa/eeschema/data/eagle_schematics/eagle-import-testfile.sch similarity index 100% rename from eeschema/qa/data/eagle_schematics/eagle-import-testfile.sch rename to qa/eeschema/data/eagle_schematics/eagle-import-testfile.sch diff --git a/eeschema/qa/data/fixtures_eagle_plugin.h b/qa/eeschema/data/fixtures_eagle_plugin.h similarity index 100% rename from eeschema/qa/data/fixtures_eagle_plugin.h rename to qa/eeschema/data/fixtures_eagle_plugin.h diff --git a/eeschema/qa/test_basic.cpp b/qa/eeschema/test_basic.cpp similarity index 100% rename from eeschema/qa/test_basic.cpp rename to qa/eeschema/test_basic.cpp diff --git a/eeschema/qa/test_module.cpp b/qa/eeschema/test_module.cpp similarity index 100% rename from eeschema/qa/test_module.cpp rename to qa/eeschema/test_module.cpp