Revert "Make sure to use only perlbrewed modules for coverage"

ledgersmb · Jul 18, 2019 · 1a186f2 · 1a186f2
1 parent d8bbb2c
commit 1a186f2
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,12 +21,12 @@ commands:
           command: |
              if [ "x$COVERAGE" == "x1" ]
              then
-               # Turn off Perl warnings
-               export PROVE="perl -X -MDevel::Cover=-silent,1 `which prove`"
-             else
-               export PROVE=prove
+               export PERL5OPT="$PERL5OPT -MDevel::Cover"
+               export PERL5LIB="$HOME/locallib/lib/perl5${PERL5LIB+:}$PERL5LIB"
              fi
-             $PROVE --recurse -j 2 \
+             echo $PERL5OPT
+             echo $PERL5LIB
+             prove --recurse -j 2 \
                    --pgtap-option dbname=lsmbinstalltest \
                    --pgtap-option username=postgres \
                    --pgtap-option psql=.circleci/psql-wrap \
@@ -87,11 +87,12 @@ commands:
           command: |
             if [ "x$COVERAGE" == "x1" ]
             then
-              export PLACKUP="perl -X -MDevel::Cover=-silent,1 `which plackup`"
-            else
-              export PLACKUP=plackup
+              export PERL5OPT="$PERL5OPT -MDevel::Cover"
+              export PERL5LIB="$HOME/locallib/lib/perl5${PERL5LIB+:}$PERL5LIB"
             fi
-            $PLACKUP -I$HOME/project/lib -I$HOME/project/old/lib \
+            echo $PERL5OPT
+            echo $PERL5LIB
+            plackup -I$HOME/project/lib -I$HOME/project/old/lib \
                     --port 5001 \
                     $HOME/project/bin/ledgersmb-server.psgi
           background: true