From b088ff18d2e10daf928d6536e07ca8f4623a2225 Mon Sep 17 00:00:00 2001 From: PeterCJ Date: Thu, 25 Nov 2021 15:45:54 -0800 Subject: [PATCH] STL-unpatched.t doesn't need to run in FreeBSD; fix MANIFEST.SKIP to not bundle .github folder --- CHANGES | 7 +++++++ MANIFEST | 1 - MANIFEST.SKIP | 1 + lib/CAD/Mesh3D.pm | 2 +- lib/CAD/Mesh3D/STL.pm | 2 +- t/STL-unpatched.t | 7 ++++++- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index c0732e2..760e5dc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,12 @@ Revision history for Perl distribution Win32-Mechanize-NotepadPlusPlus +v0.006001 2021-Nov-25 + - Update test suite again for FreeBSD: doesn't need to cover + "STL-unpatched.t" (#13) + - Fix MANIFEST.SKIP to not bundle the .github folder in the + distribution + + v0.006 2021-Nov-25 - Try to prevent FreeBSD from freezing during test suite: skip offending tests which cover FormatSTL.pm, as that module diff --git a/MANIFEST b/MANIFEST index 91caa3d..65b338d 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,4 +1,3 @@ -.github/workflows/perl-ci.yml CHANGES files/cube.stl files/cube_badfacet.stl diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP index 2af8287..069ca25 100644 --- a/MANIFEST.SKIP +++ b/MANIFEST.SKIP @@ -13,6 +13,7 @@ # pcj ^.svn/ +^.github/ ^MYMETA ^\.?travis\.yml$ ^\.?appveyor\.yml$ diff --git a/lib/CAD/Mesh3D.pm b/lib/CAD/Mesh3D.pm index 5487cdf..dd508af 100644 --- a/lib/CAD/Mesh3D.pm +++ b/lib/CAD/Mesh3D.pm @@ -5,7 +5,7 @@ use Carp; use 5.010; # M::V::R requires 5.010, so might as well make use of the defined-or // notation :-) use Math::Vector::Real 0.18; use CAD::Format::STL qw//; -our $VERSION = '0.006'; +our $VERSION = '0.006001'; =head1 NAME diff --git a/lib/CAD/Mesh3D/STL.pm b/lib/CAD/Mesh3D/STL.pm index 75cc6cc..8aff5d4 100644 --- a/lib/CAD/Mesh3D/STL.pm +++ b/lib/CAD/Mesh3D/STL.pm @@ -5,7 +5,7 @@ use Carp; use 5.010; # M::V::R requires 5.010, so might as well make use of the defined-or // notation :-) use CAD::Format::STL qw//; use CAD::Mesh3D qw/:create/; -our $VERSION = '0.006'; # auto-populated from CAD::Mesh3D +our $VERSION = '0.006001'; # auto-populated from CAD::Mesh3D # start by deciding which formatter to use our $STL_FORMATTER; diff --git a/t/STL-unpatched.t b/t/STL-unpatched.t index 844aa59..d55fc3f 100644 --- a/t/STL-unpatched.t +++ b/t/STL-unpatched.t @@ -7,8 +7,13 @@ use version 0.77; use FindBin; use lib "$FindBin::Bin/unpatched"; BEGIN { - if( $^O eq 'linux' ) { # want linux to pretend it is windows, to get full coverage of patched/unpatched + if( $^O eq 'linux' ) { + # want linux to pretend it is windows, to get full coverage of patched/unpatched + # it will _work_ on linux, but isn't required $ENV{CAD_MESH3D_OVERRIDE_OS} = 'MSWin32'; + } elsif ( $^O ne 'MSWin32' and $^O ne 'cygwin' ) { + # if it's not windows and not linux, then we don't need this + plan skip_all => 'Unpatched test not needed except on Windows'; } } use CAD::Mesh3D::STL;