[med-svn] [igraph] 02/05: fix failing test cases in the test suite

[Tamás Nepusz]

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

ntamas-guest pushed a commit to branch master
in repository igraph.

commit 389ace34c493b83fffce4bb4a28bce03eb7deed7
Author: Tamas Nepusz <ntamas at gmail.com>
Date:   Fri Aug 29 08:34:31 2014 +0000

    fix failing test cases in the test suite
---
 debian/changelog                    |  2 +
 debian/patches/fix_test_cases.patch | 83 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 86 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c6b2b82..b3434bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ igraph (0.7.1-2) UNRELEASED; urgency=medium
     BLAS, LAPACK and ARPACK are all linked dynamically
   * debian/patches/remove_unused_test_target.patch added to make
     dh_auto_test work
+  * debian/patches/fix_failing_tests.patch added to fix some failing
+    test cases 
 
  -- Andreas Tille <tille at debian.org>  Tue, 19 Aug 2014 11:55:17 +0200
 
diff --git a/debian/patches/fix_test_cases.patch b/debian/patches/fix_test_cases.patch
new file mode 100644
index 0000000..8915405
--- /dev/null
+++ b/debian/patches/fix_test_cases.patch
@@ -0,0 +1,83 @@
+Author: Tamas Nepusz <ntamas at gmail.com>
+Last-Changed: Thu, 28 Aug 2014 10:48:43 +0100
+Description: Fix failing test cases
+Bug: https://github.com/igraph/igraph/issues/676
+Applied-Upstream: 0.7.2, https://github.com/igraph/igraph/commit/c2afdb1
+
+
+--- a/examples/simple/tls2.c
++++ b/examples/simple/tls2.c
+@@ -105,10 +105,12 @@
+   }
+   
+   while (1) {
++#if IGRAPH_THREAD_SAFE
+     igraphdsaupd_(&ido, options.bmat, &options.n, options.which,
+ 		  &options.nev, &options.tol, resid, &options.ncv, v, 
+ 		  &options.ldv, options.iparam, options.ipntr, workd,
+ 		  workl, &options.lworkl, &options.info);
++#endif
+     
+     if (ido == -1 || ido == 1) {
+       
+@@ -142,12 +144,14 @@
+     return 0;
+   }
+ 
++#if IGRAPH_THREAD_SAFE
+   igraphdseupd_(&rvec, all, select, d, v, &options.ldv,
+ 		&options.sigma, options.bmat, &options.n,
+ 		options.which, &options.nev, &options.tol,
+ 		resid, &options.ncv, v, &options.ldv, options.iparam,
+ 		options.ipntr, workd, workl, &options.lworkl,
+ 		&options.ierr);
++#endif
+   
+   if (options.ierr != 0) {
+     printf("ARPACK error\n");
+--- a/examples/simple/igraph_arpack_rnsolve.c
++++ b/examples/simple/igraph_arpack_rnsolve.c
+@@ -66,6 +66,10 @@
+   igraph_arpack_rnsolve(cb2, /*extra=*/ &data, &options, /*storage=*/ 0, 
+ 			&values, &vectors);
+ 
++  while (options.nev < igraph_matrix_nrow(&values)) {
++    igraph_matrix_remove_row(&values, igraph_matrix_nrow(&values)-1);
++  }
++  
+   if (MATRIX(values, 2, 1) > 0) {
+     MATRIX(values, 2, 1) = -MATRIX(values, 2, 1);
+     MATRIX(values, 3, 1) = -MATRIX(values, 3, 1);    
+@@ -84,6 +88,10 @@
+   igraph_arpack_rnsolve(cb2, /*extra=*/ &data, &options, /*storage=*/ 0, 
+ 			&values, &vectors);
+ 
++  while (options.nev < igraph_matrix_nrow(&values)) {
++    igraph_matrix_remove_row(&values, igraph_matrix_nrow(&values)-1);
++  }
++  
+   if (MATRIX(values, 2, 1) > 0) {
+     MATRIX(values, 2, 1) = -MATRIX(values, 2, 1);
+   }
+@@ -101,6 +109,10 @@
+   igraph_arpack_rnsolve(cb2, /*extra=*/ &data, &options, /*storage=*/ 0, 
+ 			&values, &vectors);
+ 
++  while (options.nev < igraph_matrix_nrow(&values)) {
++    igraph_matrix_remove_row(&values, igraph_matrix_nrow(&values)-1);
++  }
++  
+   igraph_matrix_print(&values);
+   printf("---\n");
+   igraph_matrix_print(&vectors);
+@@ -114,6 +126,10 @@
+   igraph_arpack_rnsolve(cb2, /*extra=*/ &data, &options, /*storage=*/ 0, 
+ 			&values, &vectors);
+ 
++  while (options.nev < igraph_matrix_nrow(&values)) {
++    igraph_matrix_remove_row(&values, igraph_matrix_nrow(&values)-1);
++  }
++  
+   igraph_matrix_print(&values);
+   printf("---\n");
+   igraph_matrix_print(&vectors);
diff --git a/debian/patches/series b/debian/patches/series
index 6462a79..9a22185 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 remove_unused_test_target.patch
+fix_test_cases.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/igraph.git