qa: move pcbnew data to appropriate directory

4 years ago · 3da47e6123
103 changed files with 7 additions and 7 deletions
--- a/qa/data/pcbnew/complex_hierarchy.kicad_pcb
+++ b/qa/data/pcbnew/complex_hierarchy.kicad_pcb
--- a/qa/data/pcbnew/complex_hierarchy.kicad_pro
+++ b/qa/data/pcbnew/complex_hierarchy.kicad_pro
--- a/qa/data/pcbnew/custom_fields.kicad_pcb
+++ b/qa/data/pcbnew/custom_fields.kicad_pcb
--- a/qa/data/pcbnew/custom_fields.kicad_pro
+++ b/qa/data/pcbnew/custom_fields.kicad_pro
--- a/qa/data/pcbnew/custom_fields.kicad_sch
+++ b/qa/data/pcbnew/custom_fields.kicad_sch
--- a/qa/data/pcbnew/custom_pads.kicad_pcb
+++ b/qa/data/pcbnew/custom_pads.kicad_pcb
--- a/qa/data/pcbnew/custom_pads.kicad_pro
+++ b/qa/data/pcbnew/custom_pads.kicad_pro
--- a/qa/data/pcbnew/issue10906.kicad_pcb
+++ b/qa/data/pcbnew/issue10906.kicad_pcb
--- a/qa/data/pcbnew/issue10916.kicad_pcb
+++ b/qa/data/pcbnew/issue10916.kicad_pcb
--- a/qa/data/pcbnew/issue1358.kicad_pcb
+++ b/qa/data/pcbnew/issue1358.kicad_pcb
--- a/qa/data/pcbnew/issue1358.kicad_pro
+++ b/qa/data/pcbnew/issue1358.kicad_pro
--- a/qa/data/pcbnew/issue18.kicad_pcb
+++ b/qa/data/pcbnew/issue18.kicad_pcb
--- a/qa/data/pcbnew/issue2512.kicad_dru
+++ b/qa/data/pcbnew/issue2512.kicad_dru
--- a/qa/data/pcbnew/issue2512.kicad_pcb
+++ b/qa/data/pcbnew/issue2512.kicad_pcb
--- a/qa/data/pcbnew/issue2512.kicad_pro
+++ b/qa/data/pcbnew/issue2512.kicad_pro
--- a/qa/data/pcbnew/issue2528.kicad_pcb
+++ b/qa/data/pcbnew/issue2528.kicad_pcb
--- a/qa/data/pcbnew/issue2528.kicad_pro
+++ b/qa/data/pcbnew/issue2528.kicad_pro
--- a/qa/data/pcbnew/issue2568.kicad_pcb
+++ b/qa/data/pcbnew/issue2568.kicad_pcb
--- a/qa/data/pcbnew/issue2904.kicad_pcb
+++ b/qa/data/pcbnew/issue2904.kicad_pcb
--- a/qa/data/pcbnew/issue3812.kicad_pcb
+++ b/qa/data/pcbnew/issue3812.kicad_pcb
--- a/qa/data/pcbnew/issue3812.kicad_pro
+++ b/qa/data/pcbnew/issue3812.kicad_pro
--- a/qa/data/pcbnew/issue4139.kicad_pcb
+++ b/qa/data/pcbnew/issue4139.kicad_pcb
--- a/qa/data/pcbnew/issue4257.kicad_pcb
+++ b/qa/data/pcbnew/issue4257.kicad_pcb
--- a/qa/data/pcbnew/issue4257.pro
+++ b/qa/data/pcbnew/issue4257.pro
--- a/qa/data/pcbnew/issue4774.kicad_pcb
+++ b/qa/data/pcbnew/issue4774.kicad_pcb
--- a/qa/data/pcbnew/issue4774.kicad_pro
+++ b/qa/data/pcbnew/issue4774.kicad_pro
--- a/qa/data/pcbnew/issue5093.kicad_pcb
+++ b/qa/data/pcbnew/issue5093.kicad_pcb
--- a/qa/data/pcbnew/issue5102.kicad_pcb
+++ b/qa/data/pcbnew/issue5102.kicad_pcb
--- a/qa/data/pcbnew/issue5313.kicad_pcb
+++ b/qa/data/pcbnew/issue5313.kicad_pcb
--- a/qa/data/pcbnew/issue5320.kicad_pcb
+++ b/qa/data/pcbnew/issue5320.kicad_pcb
--- a/qa/data/pcbnew/issue5320.kicad_pro
+++ b/qa/data/pcbnew/issue5320.kicad_pro
--- a/qa/data/pcbnew/issue5567.kicad_pcb
+++ b/qa/data/pcbnew/issue5567.kicad_pcb
--- a/qa/data/pcbnew/issue5567.kicad_pro
+++ b/qa/data/pcbnew/issue5567.kicad_pro
--- a/qa/data/pcbnew/issue5750.kicad_pcb
+++ b/qa/data/pcbnew/issue5750.kicad_pcb
--- a/qa/data/pcbnew/issue5830.kicad_pcb
+++ b/qa/data/pcbnew/issue5830.kicad_pcb
--- a/qa/data/pcbnew/issue5830.kicad_pro
+++ b/qa/data/pcbnew/issue5830.kicad_pro
--- a/qa/data/pcbnew/issue5854.kicad_pcb
+++ b/qa/data/pcbnew/issue5854.kicad_pcb
--- a/qa/data/pcbnew/issue5854.kicad_pro
+++ b/qa/data/pcbnew/issue5854.kicad_pro
--- a/qa/data/pcbnew/issue5978.kicad_pcb
+++ b/qa/data/pcbnew/issue5978.kicad_pcb
--- a/qa/data/pcbnew/issue5978.kicad_pro
+++ b/qa/data/pcbnew/issue5978.kicad_pro
--- a/qa/data/pcbnew/issue5990.kicad_pcb
+++ b/qa/data/pcbnew/issue5990.kicad_pcb
--- a/qa/data/pcbnew/issue5990.kicad_pro
+++ b/qa/data/pcbnew/issue5990.kicad_pro
--- a/qa/data/pcbnew/issue6039.kicad_pcb
+++ b/qa/data/pcbnew/issue6039.kicad_pcb
--- a/qa/data/pcbnew/issue6039.kicad_pro
+++ b/qa/data/pcbnew/issue6039.kicad_pro
--- a/qa/data/pcbnew/issue6260.kicad_pcb
+++ b/qa/data/pcbnew/issue6260.kicad_pcb
--- a/qa/data/pcbnew/issue6260.kicad_pro
+++ b/qa/data/pcbnew/issue6260.kicad_pro
--- a/qa/data/pcbnew/issue6284.kicad_pcb
+++ b/qa/data/pcbnew/issue6284.kicad_pcb
--- a/qa/data/pcbnew/issue6443.kicad_pcb
+++ b/qa/data/pcbnew/issue6443.kicad_pcb
--- a/qa/data/pcbnew/issue6879.kicad_dru
+++ b/qa/data/pcbnew/issue6879.kicad_dru
--- a/qa/data/pcbnew/issue6879.kicad_pcb
+++ b/qa/data/pcbnew/issue6879.kicad_pcb
--- a/qa/data/pcbnew/issue6879.kicad_pro
+++ b/qa/data/pcbnew/issue6879.kicad_pro
--- a/qa/data/pcbnew/issue6945.kicad_dru
+++ b/qa/data/pcbnew/issue6945.kicad_dru
--- a/qa/data/pcbnew/issue6945.kicad_pcb
+++ b/qa/data/pcbnew/issue6945.kicad_pcb
--- a/qa/data/pcbnew/issue6945.kicad_pro
+++ b/qa/data/pcbnew/issue6945.kicad_pro
--- a/qa/data/pcbnew/issue7004.kicad_pcb
+++ b/qa/data/pcbnew/issue7004.kicad_pcb
--- a/qa/data/pcbnew/issue7004.pro
+++ b/qa/data/pcbnew/issue7004.pro
--- a/qa/data/pcbnew/issue7086.kicad_pcb
+++ b/qa/data/pcbnew/issue7086.kicad_pcb
--- a/qa/data/pcbnew/issue7241.kicad_pcb
+++ b/qa/data/pcbnew/issue7241.kicad_pcb
--- a/qa/data/pcbnew/issue7267.kicad_pcb
+++ b/qa/data/pcbnew/issue7267.kicad_pcb
--- a/qa/data/pcbnew/issue7267.kicad_pro
+++ b/qa/data/pcbnew/issue7267.kicad_pro
--- a/qa/data/pcbnew/issue7325.kicad_dru
+++ b/qa/data/pcbnew/issue7325.kicad_dru
--- a/qa/data/pcbnew/issue7325.kicad_pcb
+++ b/qa/data/pcbnew/issue7325.kicad_pcb
--- a/qa/data/pcbnew/issue7325.kicad_pro
+++ b/qa/data/pcbnew/issue7325.kicad_pro
--- a/qa/data/pcbnew/issue7567.kicad_dru
+++ b/qa/data/pcbnew/issue7567.kicad_dru
--- a/qa/data/pcbnew/issue7567.kicad_pcb
+++ b/qa/data/pcbnew/issue7567.kicad_pcb
--- a/qa/data/pcbnew/issue7975.kicad_pcb
+++ b/qa/data/pcbnew/issue7975.kicad_pcb
--- a/qa/data/pcbnew/issue7975.kicad_pro
+++ b/qa/data/pcbnew/issue7975.kicad_pro
--- a/qa/data/pcbnew/issue8003.kicad_pcb
+++ b/qa/data/pcbnew/issue8003.kicad_pcb
--- a/qa/data/pcbnew/issue8003.kicad_pro
+++ b/qa/data/pcbnew/issue8003.kicad_pro
--- a/qa/data/pcbnew/issue832.kicad_pcb
+++ b/qa/data/pcbnew/issue832.kicad_pcb
--- a/qa/data/pcbnew/issue8407.kicad_pcb
+++ b/qa/data/pcbnew/issue8407.kicad_pcb
--- a/qa/data/pcbnew/issue8407.kicad_pro
+++ b/qa/data/pcbnew/issue8407.kicad_pro
--- a/qa/data/pcbnew/issue8883.kicad_pcb
+++ b/qa/data/pcbnew/issue8883.kicad_pcb
--- a/qa/data/pcbnew/issue8883.kicad_pro
+++ b/qa/data/pcbnew/issue8883.kicad_pro
--- a/qa/data/pcbnew/issue8909.kicad_pcb
+++ b/qa/data/pcbnew/issue8909.kicad_pcb
--- a/qa/data/pcbnew/issue8909.kicad_pro
+++ b/qa/data/pcbnew/issue8909.kicad_pro
--- a/qa/data/pcbnew/issue9081.kicad_pcb
+++ b/qa/data/pcbnew/issue9081.kicad_pcb
--- a/qa/data/pcbnew/issue9081.kicad_pro
+++ b/qa/data/pcbnew/issue9081.kicad_pro
--- a/qa/data/pcbnew/notched_zones.kicad_pcb
+++ b/qa/data/pcbnew/notched_zones.kicad_pcb
--- a/qa/data/pcbnew/plugins/altium/pcblib/Espressif
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Espressif
--- a/qa/data/pcbnew/plugins/altium/pcblib/Espressif
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Espressif
--- a/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.PcbLib
+++ b/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.PcbLib
--- a/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/KEEPOUT.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/KEEPOUT.kicad_mod
--- a/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/MASKS.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/MASKS.kicad_mod
--- a/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/MULTILAYER
+++ b/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/MULTILAYER
--- a/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/MULTILAYER.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/MULTILAYER.kicad_mod
--- a/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/Tracks.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/Tracks.kicad_mod
--- a/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/WIDTHS.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/TracksTest.pretty/WIDTHS.kicad_mod
--- a/qa/data/pcbnew/severities.kicad_dru
+++ b/qa/data/pcbnew/severities.kicad_dru
--- a/qa/data/pcbnew/severities.kicad_pcb
+++ b/qa/data/pcbnew/severities.kicad_pcb
--- a/qa/data/pcbnew/severities.kicad_pro
+++ b/qa/data/pcbnew/severities.kicad_pro
--- a/qa/data/pcbnew/solder_mask_bridge_test.kicad_pcb
+++ b/qa/data/pcbnew/solder_mask_bridge_test.kicad_pcb
--- a/qa/data/pcbnew/solder_mask_bridge_test.kicad_pro
+++ b/qa/data/pcbnew/solder_mask_bridge_test.kicad_pro
--- a/qa/data/pcbnew/tracks_arcs_vias.kicad_pcb
+++ b/qa/data/pcbnew/tracks_arcs_vias.kicad_pcb
--- a/qa/data/pcbnew/tracks_arcs_vias.kicad_pro
+++ b/qa/data/pcbnew/tracks_arcs_vias.kicad_pro
--- a/qa/data/pcbnew/tracks_arcs_vias.kicad_sch
+++ b/qa/data/pcbnew/tracks_arcs_vias.kicad_sch
--- a/qa/data/pcbnew/zone_filler.kicad_pcb
+++ b/qa/data/pcbnew/zone_filler.kicad_pcb
--- a/qa/pcbnew_utils/CMakeLists.txt
+++ b/qa/pcbnew_utils/CMakeLists.txt
@ -87,6 +87,6 @@ target_compile_definitions( qa_pcbnew_utils

 # Pass in the default data location
 set_source_files_properties( board_file_utils.cpp PROPERTIES
-    COMPILE_DEFINITIONS "QA_PCBNEW_DATA_LOCATION=(\"${CMAKE_CURRENT_SOURCE_DIR}/../data\")"
+    COMPILE_DEFINITIONS "QA_PCBNEW_DATA_LOCATION=(\"${CMAKE_SOURCE_DIR}/qa/data/pcbnew\")"
 )

--- a/qa/testcases/test_001_pcb_load.py
+++ b/qa/testcases/test_001_pcb_load.py
@ -6,7 +6,7 @@ import pdb
 class TestPCBLoad(unittest.TestCase):

    def setUp(self):
-        self.pcb = pcbnew.LoadBoard("data/complex_hierarchy.kicad_pcb")
+        self.pcb = pcbnew.LoadBoard("data/pcbnew/complex_hierarchy.kicad_pcb")

    def test_pcb_load(self):
        self.assertNotEqual(self.pcb,None)
--- a/qa/testcases/test_002_board_class.py
+++ b/qa/testcases/test_002_board_class.py
@ -17,7 +17,7 @@ NEW_NAME = 'My_Fancy_Layer_Name'
 class TestBoardClass(unittest.TestCase):

    def setUp(self):
-        self.pcb = LoadBoard("data/complex_hierarchy.kicad_pcb")
+        self.pcb = LoadBoard("data/pcbnew/complex_hierarchy.kicad_pcb")
        self.TITLE="Test Board"
        self.COMMENT1="For load/save test"
        self.FILENAME=tempfile.mktemp()+".kicad_pcb"
@ -122,7 +122,7 @@ class TestBoardClass(unittest.TestCase):
        self.assertEqual(pcb.GetLayerID(B_CU), b_cu_id)

    def test_footprint_properties(self):
-        pcb = LoadBoard("data/custom_fields.kicad_pcb")
+        pcb = LoadBoard("data/pcbnew/custom_fields.kicad_pcb")
        footprint = pcb.FindFootprintByReference('J1')
        expected_properties = {
            'Sheet file': 'custom_fields.kicad_sch',