From 652e7dc2b12821a4cda74d956d56a83c1970db1d Mon Sep 17 00:00:00 2001 From: "Salvador E. Tropea" Date: Thu, 8 Feb 2024 08:56:25 -0300 Subject: [PATCH] [Tests][KiCad 8] Adapted some cases and references --- tests/board_samples/kicad_8/test_v5.kicad_pcb | 317 +++++++++++++++++- tests/data/config_redirect/8.0 | 1 + tests/data/kicad/8.0 | 1 + tests/data/kicad_err_1/8.0 | 1 + tests/data/kicad_err_2/8.0 | 1 + tests/data/kicad_ok/6.0/8.0 | 1 + tests/data/kicad_ok/8.0 | 1 + tests/reference/8_0_0/gencad-gencad.cad | 8 +- tests/reference/8_0_0/glasgow-boardview.brd | 128 +++---- tests/reference/8_0_0/populating_4.png | 1 + tests/test_plot/test_kicad_config_errors.py | 8 +- tests/test_plot/test_misc.py | 2 +- 12 files changed, 400 insertions(+), 70 deletions(-) mode change 120000 => 100644 tests/board_samples/kicad_8/test_v5.kicad_pcb create mode 120000 tests/data/config_redirect/8.0 create mode 120000 tests/data/kicad/8.0 create mode 120000 tests/data/kicad_err_1/8.0 create mode 120000 tests/data/kicad_err_2/8.0 create mode 120000 tests/data/kicad_ok/6.0/8.0 create mode 120000 tests/data/kicad_ok/8.0 create mode 120000 tests/reference/8_0_0/populating_4.png diff --git a/tests/board_samples/kicad_8/test_v5.kicad_pcb b/tests/board_samples/kicad_8/test_v5.kicad_pcb deleted file mode 120000 index 4ee82b5d2..000000000 --- a/tests/board_samples/kicad_8/test_v5.kicad_pcb +++ /dev/null @@ -1 +0,0 @@ -kibom-variante.kicad_pcb \ No newline at end of file diff --git a/tests/board_samples/kicad_8/test_v5.kicad_pcb b/tests/board_samples/kicad_8/test_v5.kicad_pcb new file mode 100644 index 000000000..dfb1d6e32 --- /dev/null +++ b/tests/board_samples/kicad_8/test_v5.kicad_pcb @@ -0,0 +1,316 @@ +(kicad_pcb (version 20221018) (generator pcbnew) + + (general + (thickness 1.6) + ) + + (paper "A4") + (title_block + (date "2024-01-19") + (comment 2 "The_C2") + ) + + (layers + (0 "F.Cu" signal) + (31 "B.Cu" signal) + (32 "B.Adhes" user "B.Adhesive") + (33 "F.Adhes" user "F.Adhesive") + (34 "B.Paste" user) + (35 "F.Paste" user) + (36 "B.SilkS" user "B.Silkscreen") + (37 "F.SilkS" user "F.Silkscreen") + (38 "B.Mask" user) + (39 "F.Mask" user) + (40 "Dwgs.User" user "User.Drawings") + (41 "Cmts.User" user "User.Comments") + (42 "Eco1.User" user "User.Eco1") + (43 "Eco2.User" user "User.Eco2") + (44 "Edge.Cuts" user) + (45 "Margin" user) + (46 "B.CrtYd" user "B.Courtyard") + (47 "F.CrtYd" user "F.Courtyard") + (48 "B.Fab" user) + (49 "F.Fab" user) + (50 "User.1" user) + (51 "User.2" user) + (52 "User.3" user) + (53 "User.4" user) + (54 "User.5" user) + (55 "User.6" user) + (56 "User.7" user) + (57 "User.8" user) + (58 "User.9" user) + ) + + (setup + (pad_to_mask_clearance 0) + (pcbplotparams + (layerselection 0x00010fc_ffffffff) + (plot_on_all_layers_selection 0x0000000_00000000) + (disableapertmacros false) + (usegerberextensions false) + (usegerberattributes true) + (usegerberadvancedattributes true) + (creategerberjobfile true) + (dashed_line_dash_ratio 12.000000) + (dashed_line_gap_ratio 3.000000) + (svgprecision 4) + (plotframeref false) + (viasonmask false) + (mode 1) + (useauxorigin false) + (hpglpennumber 1) + (hpglpenspeed 20) + (hpglpendiameter 15.000000) + (dxfpolygonmode true) + (dxfimperialunits true) + (dxfusepcbnewfont true) + (psnegative false) + (psa4output false) + (plotreference true) + (plotvalue true) + (plotinvisibletext false) + (sketchpadsonfab false) + (subtractmaskfromsilk false) + (outputformat 1) + (mirror false) + (drillshape 1) + (scaleselection 1) + (outputdirectory "") + ) + ) + + (net 0 "") + (net 1 "unconnected-(C1-Pad1)") + (net 2 "unconnected-(C1-Pad2)") + (net 3 "unconnected-(L1-Pad1)") + (net 4 "unconnected-(L1-Pad2)") + (net 5 "unconnected-(R1-Pad1)") + (net 6 "unconnected-(R1-Pad2)") + (net 7 "unconnected-(R2-Pad1)") + (net 8 "unconnected-(R2-Pad2)") + + (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") + (tstamp 42c79ce9-aafb-413d-89c2-2068f635b354) + (at 130.8575 77.28) + (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator") + (tags "capacitor") + (property "Sheetfile" "test_v5.kicad_sch") + (property "Sheetname" "") + (property "ki_description" "Unpolarized capacitor") + (property "ki_keywords" "cap capacitor") + (path "/00000000-0000-0000-0000-00005f3401d2") + (attr smd) + (fp_text reference "C1" (at 0 -1.68) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp a4e5ab31-f22b-4f3e-98a0-b14c18405246) + ) + (fp_text value "C" (at 0 1.68) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 526dde89-8c4d-4cf6-9e8d-955d64d4cc07) + ) + (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab") + (effects (font (size 0.5 0.5) (thickness 0.08))) + (tstamp 6dcdc843-8fdc-450c-97fb-a8d1d5407e4b) + ) + (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp df08590d-8078-4c35-b8c6-4b8079496be6)) + (fp_line (start -0.261252 0.735) (end 0.261252 0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 7d0d95c2-b427-4693-86d3-388bf5ab0d8b)) + (fp_line (start -1.7 -0.98) (end 1.7 -0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 1656b32f-92d5-4776-944c-b69c9289b967)) + (fp_line (start -1.7 0.98) (end -1.7 -0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b426ba03-5872-49e1-a001-4ec48734a59d)) + (fp_line (start 1.7 -0.98) (end 1.7 0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 3da6a9ae-ccf6-4c91-9a39-8bc5253c69c5)) + (fp_line (start 1.7 0.98) (end -1.7 0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 55424c56-b2c1-42c5-865d-4ad9becb42e0)) + (fp_line (start -1 -0.625) (end 1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 7d1fdc13-ecf7-4b23-b118-3d5227756695)) + (fp_line (start -1 0.625) (end -1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f76e662c-b67f-4319-a7fd-88ca01d3b42d)) + (fp_line (start 1 -0.625) (end 1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 69f7c786-db9c-4a4d-9637-0306913ce60e)) + (fp_line (start 1 0.625) (end -1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp f0960c8f-dc49-4619-b889-2eee0ef4acf5)) + (pad "1" smd roundrect (at -0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 1 "unconnected-(C1-Pad1)") (pintype "passive") (tstamp 81025ca8-7809-44d1-bfd0-73d5e5bec49a)) + (pad "2" smd roundrect (at 0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 2 "unconnected-(C1-Pad2)") (pintype "passive") (tstamp 3af47cba-5141-4c61-8d2f-051f78ccb223)) + (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (footprint "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu") + (tstamp 4b05d10d-d03b-4245-93c6-6dd7ef115d79) + (at 135.2875 80.2) + (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") + (tags "resistor") + (property "Sheetfile" "test_v5.kicad_sch") + (property "Sheetname" "") + (property "ki_description" "Resistor, US symbol") + (property "ki_keywords" "R res resistor") + (path "/00000000-0000-0000-0000-00005f3409f7") + (attr smd) + (fp_text reference "R2" (at 0 -1.65) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp fc3e7acd-6aba-4677-895d-30650b88b9bd) + ) + (fp_text value "R_US" (at 0 1.65) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 914f698d-f318-4829-9016-a903c7872dbc) + ) + (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab") + (effects (font (size 0.5 0.5) (thickness 0.08))) + (tstamp 39d87a78-7775-414a-8b62-fc1ae7be8441) + ) + (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp a5c1fe7f-d528-424f-89d7-027a831e1a9b)) + (fp_line (start -0.227064 0.735) (end 0.227064 0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 3c3ad48b-9713-4def-9e3a-8f6f2fe2ec34)) + (fp_line (start -1.68 -0.95) (end 1.68 -0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 47606320-c86c-4a12-acc0-762f5fd95781)) + (fp_line (start -1.68 0.95) (end -1.68 -0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp a829f1e2-4d3f-4620-bd44-735437433444)) + (fp_line (start 1.68 -0.95) (end 1.68 0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 965745e8-055c-4eb4-99fc-900a1cc81ab2)) + (fp_line (start 1.68 0.95) (end -1.68 0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 499c95b1-a991-4ca4-ab65-93f3d8825419)) + (fp_line (start -1 -0.625) (end 1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 20288645-8afc-4f62-8e79-c0578f3d1ec3)) + (fp_line (start -1 0.625) (end -1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6defbaa3-b366-4044-b064-b4f24dfa32c6)) + (fp_line (start 1 -0.625) (end 1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 069cbe26-1be9-4f2d-a019-1e3863031005)) + (fp_line (start 1 0.625) (end -1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp c8e760cf-2f4a-4a3e-a43a-4510a1054574)) + (pad "1" smd roundrect (at -0.9125 0) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902) + (net 7 "unconnected-(R2-Pad1)") (pintype "passive") (tstamp d401cb0e-247f-4d68-afff-bc476c13a921)) + (pad "2" smd roundrect (at 0.9125 0) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902) + (net 8 "unconnected-(R2-Pad2)") (pintype "passive") (tstamp 873a10e3-545f-45c5-bd99-87a89cd9e846)) + (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (footprint "Capacitor_SMD:C_0805_2012Metric" (layer "F.Cu") + (tstamp 7757e0f5-d98e-4377-b151-2fe874013657) + (at 130.8575 80.29) + (descr "Capacitor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 76, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf, https://docs.google.com/spreadsheets/d/1BsfQQcO9C6DZCsRaXUlFlo91Tg2WpOkGARC1WS5S8t0/edit?usp=sharing), generated with kicad-footprint-generator") + (tags "capacitor") + (property "Sheetfile" "test_v5.kicad_sch") + (property "Sheetname" "") + (property "ki_description" "Inductor") + (property "ki_keywords" "inductor choke coil reactor magnetic") + (path "/00000000-0000-0000-0000-00005f33f73d") + (attr smd) + (fp_text reference "L1" (at 0 -1.68) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp bf92c542-4775-4aa2-93ce-6b327a1017e0) + ) + (fp_text value "L" (at 0 1.68) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 5c5d88aa-0446-4077-95a7-504d6e9a7174) + ) + (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab") + (effects (font (size 0.5 0.5) (thickness 0.08))) + (tstamp 871d5cde-1811-4554-85be-425b53eb376d) + ) + (fp_line (start -0.261252 -0.735) (end 0.261252 -0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c6e02f1c-5c1c-46c5-ba4f-121c6f08fa0c)) + (fp_line (start -0.261252 0.735) (end 0.261252 0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp c117cb72-2504-4c3e-9a8c-b1ef736c7dcf)) + (fp_line (start -1.7 -0.98) (end 1.7 -0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 4fad87b7-d717-4cd1-ab4c-2d260259c9a2)) + (fp_line (start -1.7 0.98) (end -1.7 -0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 0a5d800a-1945-4bc4-b640-91ea891a8cd9)) + (fp_line (start 1.7 -0.98) (end 1.7 0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 5208322d-c18f-4c97-9984-873b07c3f72a)) + (fp_line (start 1.7 0.98) (end -1.7 0.98) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 536ca379-6f4f-43b5-abe0-64da3660d513)) + (fp_line (start -1 -0.625) (end 1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 26605af3-b382-4433-80e1-d1d0f2c5f925)) + (fp_line (start -1 0.625) (end -1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 6a670d44-5ef4-48f0-999a-3c4eca5ff1ae)) + (fp_line (start 1 -0.625) (end 1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 1b3c5810-d3f3-44f6-9aad-2e1464646278)) + (fp_line (start 1 0.625) (end -1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 4b5533f7-92eb-40d0-8a4d-287706773ed4)) + (pad "1" smd roundrect (at -0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 3 "unconnected-(L1-Pad1)") (pinfunction "1") (pintype "passive") (tstamp 550a117e-d30e-43a0-872d-fd44bd568eb3)) + (pad "2" smd roundrect (at 0.95 0) (size 1 1.45) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.25) + (net 4 "unconnected-(L1-Pad2)") (pinfunction "2") (pintype "passive") (tstamp 83387907-f9d1-4b9e-9c72-10d8d2879e36)) + (model "${KICAD6_3DMODEL_DIR}/Capacitor_SMD.3dshapes/C_0805_2012Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (footprint "Resistor_SMD:R_0805_2012Metric" (layer "F.Cu") + (tstamp f417b356-ef41-45de-90f6-64820d7b3b0a) + (at 135.2875 77.25) + (descr "Resistor SMD 0805 (2012 Metric), square (rectangular) end terminal, IPC_7351 nominal, (Body size source: IPC-SM-782 page 72, https://www.pcb-3d.com/wordpress/wp-content/uploads/ipc-sm-782a_amendment_1_and_2.pdf), generated with kicad-footprint-generator") + (tags "resistor") + (property "Sheetfile" "test_v5.kicad_sch") + (property "Sheetname" "") + (property "Test" "Hi! \"quoted text\"") + (path "/00000000-0000-0000-0000-00005f33ec02") + (attr smd) + (fp_text reference "R1" (at 0 -1.65) (layer "F.SilkS") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp 6cb569e3-7a4e-4388-b704-a771991f11b4) + ) + (fp_text value "R" (at 0 1.65) (layer "F.Fab") + (effects (font (size 1 1) (thickness 0.15))) + (tstamp eac495d8-f62f-476b-a847-947f2361c73f) + ) + (fp_text user "${REFERENCE}" (at 0 0) (layer "F.Fab") + (effects (font (size 0.5 0.5) (thickness 0.08))) + (tstamp 29a54455-c7b6-42fe-ad04-c9f406c4aa1c) + ) + (fp_line (start -0.227064 -0.735) (end 0.227064 -0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp cc153304-d18b-4e2b-b55c-554c3496f3e0)) + (fp_line (start -0.227064 0.735) (end 0.227064 0.735) + (stroke (width 0.12) (type solid)) (layer "F.SilkS") (tstamp 9b0898f4-7a9a-4521-9fe8-d54fa01ecc9d)) + (fp_line (start -1.68 -0.95) (end 1.68 -0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp b71a22b5-4e56-4351-adf7-4f64dac3caa2)) + (fp_line (start -1.68 0.95) (end -1.68 -0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 6804d6d5-c6af-4fb0-9dc8-e2edc4c8bbd0)) + (fp_line (start 1.68 -0.95) (end 1.68 0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp 190e9d55-cb48-42e1-9b6a-a42ad2919da8)) + (fp_line (start 1.68 0.95) (end -1.68 0.95) + (stroke (width 0.05) (type solid)) (layer "F.CrtYd") (tstamp f978d1b4-673d-4e04-a3f6-daed6f618d7b)) + (fp_line (start -1 -0.625) (end 1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 0210446f-f1af-4d5a-8b86-90afafd41a49)) + (fp_line (start -1 0.625) (end -1 -0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 92bad6ea-95b2-403d-a9f6-5bb64d91618c)) + (fp_line (start 1 -0.625) (end 1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp 056da58b-0a79-4d13-85c4-560d94e01465)) + (fp_line (start 1 0.625) (end -1 0.625) + (stroke (width 0.1) (type solid)) (layer "F.Fab") (tstamp e14f4329-4f31-45b1-a58a-115bc8371b27)) + (pad "1" smd roundrect (at -0.9125 0) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902) + (net 5 "unconnected-(R1-Pad1)") (pintype "passive") (tstamp 788a6374-b3f2-4845-8786-f708721b7ca5)) + (pad "2" smd roundrect (at 0.9125 0) (size 1.025 1.4) (layers "F.Cu" "F.Paste" "F.Mask") (roundrect_rratio 0.243902) + (net 6 "unconnected-(R1-Pad2)") (pintype "passive") (tstamp a9d89d14-b14c-45f1-8d11-df20ec2515c4)) + (model "${KICAD6_3DMODEL_DIR}/Resistor_SMD.3dshapes/R_0805_2012Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + (model "${KIPRJMOD}/../../data/R_0805_2012Metric.wrl" + (offset (xyz 0 0 0)) + (scale (xyz 1 1 1)) + (rotate (xyz 0 0 0)) + ) + ) + + (gr_rect (start 126.7 71.3) (end 140.9 87.9) + (stroke (width 0.05) (type default)) (fill none) (layer "Edge.Cuts") (tstamp d645f00e-19f1-43e7-8c43-ee0954e655cf)) + +) diff --git a/tests/data/config_redirect/8.0 b/tests/data/config_redirect/8.0 new file mode 120000 index 000000000..504953848 --- /dev/null +++ b/tests/data/config_redirect/8.0 @@ -0,0 +1 @@ +6.0 \ No newline at end of file diff --git a/tests/data/kicad/8.0 b/tests/data/kicad/8.0 new file mode 120000 index 000000000..504953848 --- /dev/null +++ b/tests/data/kicad/8.0 @@ -0,0 +1 @@ +6.0 \ No newline at end of file diff --git a/tests/data/kicad_err_1/8.0 b/tests/data/kicad_err_1/8.0 new file mode 120000 index 000000000..504953848 --- /dev/null +++ b/tests/data/kicad_err_1/8.0 @@ -0,0 +1 @@ +6.0 \ No newline at end of file diff --git a/tests/data/kicad_err_2/8.0 b/tests/data/kicad_err_2/8.0 new file mode 120000 index 000000000..504953848 --- /dev/null +++ b/tests/data/kicad_err_2/8.0 @@ -0,0 +1 @@ +6.0 \ No newline at end of file diff --git a/tests/data/kicad_ok/6.0/8.0 b/tests/data/kicad_ok/6.0/8.0 new file mode 120000 index 000000000..b293f64d6 --- /dev/null +++ b/tests/data/kicad_ok/6.0/8.0 @@ -0,0 +1 @@ +8.0 \ No newline at end of file diff --git a/tests/data/kicad_ok/8.0 b/tests/data/kicad_ok/8.0 new file mode 120000 index 000000000..504953848 --- /dev/null +++ b/tests/data/kicad_ok/8.0 @@ -0,0 +1 @@ +6.0 \ No newline at end of file diff --git a/tests/reference/8_0_0/gencad-gencad.cad b/tests/reference/8_0_0/gencad-gencad.cad index 3727c9f1b..3f00b3122 100644 --- a/tests/reference/8_0_0/gencad-gencad.cad +++ b/tests/reference/8_0_0/gencad-gencad.cad @@ -9,10 +9,10 @@ INTERTRACK 0 $ENDHEADER $BOARD -LINE 7.4 -2.75 5.6 -2.75 -LINE 5.6 -2.75 5.6 -3.6 -LINE 7.4 -3.6 7.4 -2.75 -LINE 5.6 -3.6 7.4 -3.6 +LINE 7.4 -3.6 5.6 -3.6 +LINE 5.6 -3.6 5.6 -2.75 +LINE 5.6 -2.75 7.4 -2.75 +LINE 7.4 -2.75 7.4 -3.6 $ENDBOARD $PADS diff --git a/tests/reference/8_0_0/glasgow-boardview.brd b/tests/reference/8_0_0/glasgow-boardview.brd index f07c548ba..b7191a3ce 100644 --- a/tests/reference/8_0_0/glasgow-boardview.brd +++ b/tests/reference/8_0_0/glasgow-boardview.brd @@ -1,74 +1,78 @@ 0 -BRDOUT: 69 5118 4724 -4976 2796 -4991 2798 -5006 2802 -5020 2807 -5034 2813 -5048 2821 -5060 2831 -5071 2841 -5082 2852 -5091 2865 -5099 2878 -5106 2892 -5111 2907 -5115 2922 -5117 2937 +BRDOUT: 73 5118 4724 +4968 2795 +4983 2796 +4998 2799 +5013 2804 +5028 2810 +5041 2817 +5054 2826 +5066 2836 +5077 2846 +5087 2858 +5095 2871 +5103 2885 +5108 2899 +5113 2914 +5116 2929 +5118 2945 5118 2952 5118 4566 -5117 4582 -5115 4597 -5111 4612 -5106 4627 -5099 4641 -5091 4654 -5082 4666 -5071 4678 -5060 4688 -5048 4697 -5034 4705 -5020 4712 -5006 4717 -4991 4721 -4976 4723 +5118 4574 +5116 4590 +5113 4605 +5108 4620 +5103 4634 +5095 4647 +5087 4660 +5077 4672 +5066 4683 +5054 4693 +5041 4702 +5028 4709 +5013 4715 +4998 4719 +4983 4722 +4968 4724 4960 4724 2125 4724 -2110 4723 -2095 4721 -2080 4717 -2065 4712 -2051 4705 -2038 4697 -2026 4688 -2014 4678 -2004 4666 -1995 4654 -1987 4641 -1980 4627 -1975 4612 -1971 4597 -1969 4582 +2118 4724 +2102 4722 +2087 4719 +2072 4715 +2058 4709 +2044 4702 +2032 4693 +2020 4683 +2009 4672 +1999 4660 +1990 4647 +1983 4634 +1977 4620 +1973 4605 +1970 4590 +1968 4574 1968 4566 1968 2952 -1969 2937 -1971 2922 -1975 2907 -1980 2892 -1987 2878 -1995 2865 -2004 2852 -2014 2841 -2026 2831 -2038 2821 -2051 2813 -2065 2807 -2080 2802 -2095 2798 -2110 2796 +1968 2945 +1970 2929 +1973 2914 +1977 2899 +1983 2885 +1990 2871 +1999 2858 +2009 2846 +2020 2836 +2032 2826 +2044 2817 +2058 2810 +2072 2804 +2087 2799 +2102 2796 +2118 2795 2125 2795 4960 2795 -4976 2796 +4968 2795 NETS: 227 1 /SDA diff --git a/tests/reference/8_0_0/populating_4.png b/tests/reference/8_0_0/populating_4.png new file mode 120000 index 000000000..23f65bc13 --- /dev/null +++ b/tests/reference/8_0_0/populating_4.png @@ -0,0 +1 @@ +../7_0_10/populating_4.png \ No newline at end of file diff --git a/tests/test_plot/test_kicad_config_errors.py b/tests/test_plot/test_kicad_config_errors.py index cc8dbe8f1..4c88652f5 100644 --- a/tests/test_plot/test_kicad_config_errors.py +++ b/tests/test_plot/test_kicad_config_errors.py @@ -86,7 +86,9 @@ def test_kicad_conf_guess_libs(monkeypatch): """ Check no HOME and fail to load kicad_common. Also check we correctly guess the libs dir. """ res = check_load_conf(fail=True, no_conf_path=True) - if context.ki7(): + if context.ki8(): + name = "KICAD8_SYMBOL_DIR" + elif context.ki7(): name = "KICAD7_SYMBOL_DIR" elif context.ki6(): name = "KICAD6_SYMBOL_DIR" @@ -98,7 +100,9 @@ def test_kicad_conf_guess_libs(monkeypatch): def test_kicad_conf_lib_env(monkeypatch): """ Check we can use KICAD_SYMBOL_DIR as fallback """ - if context.ki7(): + if context.ki8(): + name = "KICAD8_SYMBOL_DIR" + elif context.ki7(): name = "KICAD7_SYMBOL_DIR" elif context.ki6(): name = "KICAD6_SYMBOL_DIR" diff --git a/tests/test_plot/test_misc.py b/tests/test_plot/test_misc.py index e1ad8e493..8b0637167 100644 --- a/tests/test_plot/test_misc.py +++ b/tests/test_plot/test_misc.py @@ -1934,7 +1934,7 @@ def test_populate_1(test_dir): prj = 'simple_2layer' # Fake ctx = context.TestContext(test_dir, prj, 'populate', 'Populate') ctx.run(no_board_file=True, extra=['-b', 'tests/data/ArduinoLearningKitStarter.kicad_pcb', 'Populate']) - ctx.compare_image('Populate/img/populating_4.png', 'populating_4.png') + ctx.compare_image('Populate/img/populating_4.png', 'populating_4.png', tol=100) ctx.clean_up()