[Pkg-octave-commit] [octave-cgi.git] 01/01: Adjust unit test for running at package build time

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-cgi.git.

commit 4f9092552645f918a7dab417d84d398ca813521f
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Wed Aug 31 20:48:16 2016 -0300

    Adjust unit test for running at package build time
    
    Gbp-Dch: Ignore
---
 debian/check.m                                     |  3 +--
 debian/patches/load-cgi-package-in-unit-test.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/debian/check.m b/debian/check.m
index 99aa75e..e372df5 100644
--- a/debian/check.m
+++ b/debian/check.m
@@ -1,3 +1,2 @@
 disp ("[test_cgi.sh]")
-cd doc
-system ("sh test_cgi.sh")
+system ("sh doc/test_cgi.sh")
diff --git a/debian/patches/load-cgi-package-in-unit-test.patch b/debian/patches/load-cgi-package-in-unit-test.patch
index 2ea3421..088aaee 100644
--- a/debian/patches/load-cgi-package-in-unit-test.patch
+++ b/debian/patches/load-cgi-package-in-unit-test.patch
@@ -1,6 +1,6 @@
-Description: Load the cgi pacakge when running the unit tests
+Description: Allow running the unit tests
 Author: Rafael Laboissiere <rafael at debian.org>
-Forwarded: https://savannah.gnu.org/bugs/index.php?48966
+Forwarded: no
 Last-Update: 2016-08-31
 
 --- octave-cgi-0.1.1.orig/doc/test_cgi.sh
@@ -9,7 +9,7 @@ Last-Update: 2016-08-31
  
  echo "Test GET request"
  octave -q <<EOF
-+pkg load cgi
++addpath ("inst");
  CGI = cgi();
  disp(CGI.form.y)
  assert(strcmp(CGI.form.y,'1,2,3'))
@@ -17,7 +17,7 @@ Last-Update: 2016-08-31
  export QUERY_STRING="x=50%2C1,2;y=1,2,3;len=10;name=test;field=random_field" 
  
  octave -q <<EOF
-+pkg load cgi
++addpath ("inst");
  CGI = cgi();
  assert(strcmp(CGI.form.y,'1,2,3'))
  assert(strcmp(CGI.form.field,'random_field'))
@@ -26,5 +26,5 @@ Last-Update: 2016-08-31
  
  echo "x=50%2C1,2&y=1,2,3&len=10&name=test&field=random_field" | \
 -    octave -qH --eval "CGI = cgi(); assert(strcmp(CGI.form.y,'1,2,3')); disp('All tests passed');";
-+    octave -qH --eval "pkg load cgi; CGI = cgi(); assert(strcmp(CGI.form.y,'1,2,3')); disp('All tests passed');";
++    octave -qH --eval "addpath ("inst"); CGI = cgi(); assert(strcmp(CGI.form.y,'1,2,3')); disp('All tests passed');";
  

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-cgi.git.git