tests run in container in container

samba2 · Aug 19, 2020 · e79c0cf · e79c0cf
1 parent 494be06
commit e79c0cf
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 39 deletions.
diff --git a/cgi/DownloadFile.cgi b/cgi/DownloadFile.cgi
@@ -2,16 +2,15 @@
 #! -*-perl-*-
 # run with the provided perl interpreter.
 # some magic inspired from 'perldoc perlrun'
-eval 'exec $(realpath ../perl5/bin/perl) -w -x $0'
+eval 'exec $(realpath ../perl5/bin/perl) \
+    -I ../perl5/lib/provided_version/ \
+    -I ../perl5/lib/provided_version/x86_64-linux/ \
+    -I ../perl5/lib/site_perl/provided_version/ \
+    -I ../perl5/lib/site_perl/provided_version/x86_64-linux/ \
+    -I ../lib/ \
+    -w -x $0'
    if 0;
 
-BEGIN {push @INC , 
-    '../perl5/lib/provided_version/', 
-    '../perl5/lib/provided_version/x86_64-linux/', 
-    '../perl5/lib/site_perl/provided_version/', 
-    '../perl5/lib/site_perl/provided_version/x86_64-linux/', 
-    '../lib/'}
-
 use strict;
 use MyFav::SubApps::DownloadFile;
 

diff --git a/cgi/Login.cgi b/cgi/Login.cgi
@@ -2,16 +2,15 @@
 #! -*-perl-*-
 # run with the provided perl interpreter.
 # some magic inspired from 'perldoc perlrun'
-eval 'exec $(realpath ../perl5/bin/perl) -w -x $0'
+eval 'exec $(realpath ../perl5/bin/perl) \
+    -I ../perl5/lib/provided_version/ \
+    -I ../perl5/lib/provided_version/x86_64-linux/ \
+    -I ../perl5/lib/site_perl/provided_version/ \
+    -I ../perl5/lib/site_perl/provided_version/x86_64-linux/ \
+    -I ../lib/ \
+    -w -x $0'
    if 0;
 
-BEGIN {push @INC , 
-    '../perl5/lib/provided_version/', 
-    '../perl5/lib/provided_version/x86_64-linux/', 
-    '../perl5/lib/site_perl/provided_version/', 
-    '../perl5/lib/site_perl/provided_version/x86_64-linux/', 
-    '../lib/'}
-
 use strict;
 use MyFav::SubApps::Login;
 

diff --git a/cgi/Releases.cgi b/cgi/Releases.cgi
@@ -2,16 +2,15 @@
 #! -*-perl-*-
 # run with the provided perl interpreter.
 # some magic inspired from 'perldoc perlrun'
-eval 'exec $(realpath ../perl5/bin/perl) -w -x $0'
+eval 'exec $(realpath ../perl5/bin/perl) \
+    -I ../perl5/lib/provided_version/ \
+    -I ../perl5/lib/provided_version/x86_64-linux/ \
+    -I ../perl5/lib/site_perl/provided_version/ \
+    -I ../perl5/lib/site_perl/provided_version/x86_64-linux/ \
+    -I ../lib/ \
+    -w -x $0'
    if 0;
 
-BEGIN {push @INC , 
-    '../perl5/lib/provided_version/', 
-    '../perl5/lib/provided_version/x86_64-linux/', 
-    '../perl5/lib/site_perl/provided_version/', 
-    '../perl5/lib/site_perl/provided_version/x86_64-linux/', 
-    '../lib/'}
-
 use strict;
 use MyFav::SubApps::Releases;
 

diff --git a/cgi/Wizard.cgi b/cgi/Wizard.cgi
@@ -2,16 +2,15 @@
 #! -*-perl-*-
 # run with the provided perl interpreter.
 # some magic inspired from 'perldoc perlrun'
-eval 'exec $(realpath ../perl5/bin/perl) -w -x $0'
+eval 'exec $(realpath ../perl5/bin/perl) \
+    -I ../perl5/lib/provided_version/ \
+    -I ../perl5/lib/provided_version/x86_64-linux/ \
+    -I ../perl5/lib/site_perl/provided_version/ \
+    -I ../perl5/lib/site_perl/provided_version/x86_64-linux/ \
+    -I ../lib/ \
+    -w -x $0'
    if 0;
 
-BEGIN {push @INC , 
-    '../perl5/lib/provided_version/', 
-    '../perl5/lib/provided_version/x86_64-linux/', 
-    '../perl5/lib/site_perl/provided_version/', 
-    '../perl5/lib/site_perl/provided_version/x86_64-linux/', 
-    '../lib/'}
-
 use strict;
 use MyFav::SubApps::Wizard;
 

diff --git a/test/Runner.t b/test/Runner.t
@@ -1,13 +1,13 @@
-#! /usr/bin/perl
+#!/usr/bin/perl
 use FindBin 1.51 qw( $RealBin );
 use lib $RealBin;
 
-# use TestContainerTest;
+use TestContainerTest;
 use InstallTest;
-# use InstallOkTest;
-# use LoginTest;
-# use WizardTest;
-# use ReleasesTest;
-# use DownloadFileTest;
+use InstallOkTest;
+use LoginTest;
+use WizardTest;
+use ReleasesTest;
+use DownloadFileTest;
 
 Test::Class->runtests;