Move to Test2::V0

sanko · Mar 17, 2024 · 8a0c581 · 8a0c581
1 parent 574fb5e
commit 8a0c581
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/Build.PL b/Build.PL
@@ -40,7 +40,7 @@ my %args = (
 
     test_requires => {
         'File::Temp' => '0',
-        'Test::More' => '0.98',
+        'Test2::V0' => '0',
     },
 
     name            => 'Alien-xmake',

diff --git a/Changes b/Changes
@@ -3,6 +3,7 @@ Revision history for Perl extension Alien::xmake
 {{$NEXT}}
 
     - Minor documentation changes
+    - Move to Test2::V0
 
 0.01 2023-10-02T22:07:51Z
 

diff --git a/META.json b/META.json
@@ -68,7 +68,7 @@
       "test" : {
          "requires" : {
             "File::Temp" : "0",
-            "Test::More" : "0.98"
+            "Test2::V0" : "0"
          }
       }
    },

diff --git a/builder/xmake.pm b/builder/xmake.pm
@@ -288,7 +288,8 @@ package builder::xmake {
         chdir $projectdir;
         `./configure` unless -f "$projectdir/makefile";
         chdir $cwd;    # I really should go to dist base dir
-        warn 'Building with ' . $make;
+
+        #~ warn 'Building with ' . $make;
         `$make -C $projectdir`;
         `$make -C $projectdir install PREFIX=$share`;
         return $share;

diff --git a/cpanfile b/cpanfile
@@ -3,7 +3,7 @@ requires 'File::ShareDir';
 requires 'File::Which';
 requires 'Module::Build';
 on 'test' => sub {
-    requires 'Test::More', '0.98';
+    requires 'Test2::V0';
     requires 'File::Temp';
 };
 on 'configure' => sub {

diff --git a/t/00_compile.t b/t/00_compile.t
@@ -1,14 +1,15 @@
 use strict;
 use warnings;
 use lib 'lib', '../blib/lib', '../lib';
-use Test::More 0.98;
+use Test2::V0;
 use Env qw[@PATH];
 #
 use Alien::xmake;
 #
-diag 'Alien::xmake is a ' . Alien::xmake->install_type . ' install';
+diag 'Install type: ' . Alien::xmake->install_type;
 unshift @PATH, Alien::xmake->bin_dir;
 my $exe = Alien::xmake->exe;
+diag 'Path to exe:  ' . $exe;
 ok $exe, 'xmake is installed as ' . $exe;
 diag 'Running `xmake --version`';
 my $run = `$exe --version`;

diff --git a/t/01_build_cpp.t b/t/01_build_cpp.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 use lib 'lib', '../blib/lib', '../lib';
-use Test::More 0.98;
+use Test2::V0;
 use File::Temp qw[tempdir];
 use Env        qw[@PATH];
 #
@@ -16,8 +16,8 @@ use Alien::xmake;
     system $exe, qw[create --quiet --project=test_cpp --language=c++ --template=console];
     ok( ( -d 'test_cpp' ), 'project created' );
     chdir 'test_cpp';
-TODO: {
-        local $TODO = 'Require a working compiler';    # outside the scope of Alien::xmake
+    subtest compile => sub {
+        my $todo = todo 'Require a working compiler';    # outside the scope of Alien::xmake
         diag 'Building project..';
         ok !system( $exe, '--quiet' ), 'project built';
         my $greeting = `$exe run`;