only run expl3-dependent tests in continuous integration (#2234)

* only run expl3-dependent tests in continuous integration * also transition 83_expl3.t to new CI idiom
brucemiller · Oct 15, 2023 · 56886ab · 56886ab
1 parent e006ad9
commit 56886ab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/lib/LaTeXML/Util/Test.pm b/lib/LaTeXML/Util/Test.pm
@@ -86,12 +86,14 @@ sub check_requirements {
     next unless $reqmts;
     my @required_packages = ();
     my $texlive_min       = 0;
+    my $required_env;
     if (!(ref $reqmts)) {
       @required_packages = ($reqmts); }
     elsif (ref $reqmts eq 'ARRAY') {
       @required_packages = @$reqmts; }
     elsif (ref $reqmts eq 'HASH') {
       @required_packages = (ref $$reqmts{packages} eq 'ARRAY' ? @{ $$reqmts{packages} } : $$reqmts{packages});
+      $required_env      = $$reqmts{env};
       $texlive_min       = $$reqmts{texlive_min} || 0; }
     foreach my $reqmt (@required_packages) {
       if (pathname_kpsewhich($reqmt) || pathname_find($reqmt)) { }
@@ -105,6 +107,11 @@ sub check_requirements {
       my $message = "Minimal texlive $texlive_min requirement not met for $test";
       diag("Skip: $message");
       skip($message, $ntests);
+      return 0; }
+    elsif ($required_env && !$ENV{$required_env}) {
+      my $message = "$test is only checked in continuous integration. (use make test CI=true)";
+      diag("Skip: $message");
+      skip($message, $ntests);
       return 0; } }
   return 1; }
 

diff --git a/t/50_structure.t b/t/50_structure.t
@@ -9,5 +9,6 @@ latexml_tests("t/structure",
     amsarticle => 'amsart.cls',
     csquotes   => 'csquotes.sty',
     glossary   => {
+      env => 'CI', # only run in continuous integration
       texlive_min => 2016,
       packages    => 'glossaries.sty' } });
diff --git a/t/80_complex.t b/t/80_complex.t
@@ -7,4 +7,6 @@ use LaTeXML::Util::Test;
 latexml_tests("t/complex",
   requires => {
     cleveref_minimal => 'cleveref.sty',
-    si               => { packages => 'siunitx.sty', texlive_min => 2015 } });
+    si               => {
+      env=>'CI', # only runs in continuous integration
+      packages => 'siunitx.sty', texlive_min => 2015 } });
diff --git a/t/83_expl3.t b/t/83_expl3.t
@@ -6,18 +6,14 @@ use strict;
 use warnings;
 use LaTeXML::Util::Test;
 
-if (!$ENV{"CI"}) {
-  plan skip_all => "Only checked in continuous integration. (use make test CI=true)";
-  done_testing();
-  exit;
-}
-
 latexml_tests("t/expl3",
   requires => {
     tilde_tricks => {
+      env => 'CI',
       texlive_min => 2018,
       packages    => 'expl3.sty' },
     xparse => {
+      env => 'CI',
       texlive_min => 2019,
       packages    => ['expl3.sty', 'xparse.sty']
     } });