[143302] trunk/dports/math/itsol

[dstrubbe at macports.org]

Revision: 143302
          https://trac.macports.org/changeset/143302
Author:   dstrubbe at macports.org
Date:     2015-12-09 18:54:10 -0800 (Wed, 09 Dec 2015)
Log Message:
-----------
itsol: Enable test phase.

Modified Paths:
--------------
    trunk/dports/math/itsol/Portfile
    trunk/dports/math/itsol/files/patch-makefile.diff

Added Paths:
-----------
    trunk/dports/math/itsol/files/patch-TESTS-matfile.diff

Modified: trunk/dports/math/itsol/Portfile
===================================================================
--- trunk/dports/math/itsol/Portfile	2015-12-09 23:58:28 UTC (rev 143301)
+++ trunk/dports/math/itsol/Portfile	2015-12-10 02:54:10 UTC (rev 143302)
@@ -35,7 +35,8 @@
 
 patchfiles          patch-INC_protos.h.diff \
                     patch-SRC.diff \
-                    patch-makefile.diff
+                    patch-makefile.diff \
+                    patch-TESTS-matfile.diff
 
 depends_lib         path:lib/libgcc/libgcc_s.1.dylib:libgcc
 
@@ -169,12 +170,12 @@
 
 if {[variant_isset accelerate]} {
 
-    configure.ldflags-append "-Wl,-framework -Wl,Accelerate"
+    configure.ldflags-append -Wl,-framework -Wl,Accelerate
 
 } else {
 
     depends_lib-append       port:atlas
-    configure.ldflags-append "-llapack -lcblas -lf77blas -latlas"
+    configure.ldflags-append -llapack -lcblas -lf77blas -latlas
 
 }
 
@@ -199,3 +200,11 @@
         ui_msg "\nWARNING: The +accelerate variant has been selected, using Apple's Vector Libraries which have known bugs that can cause crashes.  The +atlas variant does not have these issues, and is generally considered a better way to go.\n"
     }
 }
+
+test.run       yes
+pre-test {
+    test.args-append     LINKS="-L../LIB -litsol" \
+        FC="${configure.fc}" FCFLAGS="${configure.fcflags}" \
+        CC="${configure.cc}" CCFLAGS="-c -I ../INC ${configure.cflags} -DLINUX" \
+        LD="${configure.fc}" LDFLAGS="${configure.ldflags}"
+}

Added: trunk/dports/math/itsol/files/patch-TESTS-matfile.diff
===================================================================
--- trunk/dports/math/itsol/files/patch-TESTS-matfile.diff	                        (rev 0)
+++ trunk/dports/math/itsol/files/patch-TESTS-matfile.diff	2015-12-10 02:54:10 UTC (rev 143302)
@@ -0,0 +1,29 @@
+--- TESTS/matfile.orig	2015-12-09 19:30:45.000000000 -0500
++++ TESTS/matfile	2015-12-09 19:31:50.000000000 -0500
+@@ -1,24 +1,5 @@
+- 6
+- /project/scicom/scicom00/DATA/HB/SHERMAN5 SHERMAN5 HB
+- /project/scicom/scicom00/DATA/HB/PORES1 PORES1 HB 
++ 4
+  ./MATRICES/SHERMAN5 SHERMAN5 HB
+- /scratch/syphax/MATRICES3/Florida/circuit_3.mtx circuit3 MM1
+- /scratch/syphax/MATRICES3/MatrixMarket/cry10000.rua cry10000 HB
+- /project/scicom/scicom00/DATA/HB/JPWH991 JPWH991 HB
+- /scratch/syphax/MATRICES3/Florida/Raj1.mtx Raj1 MM1  
+- /project/scicom/scicom00/DATA/MATRICES/SIMON/RAEFSKY6 RAEFSKY6 HB
+  ./MATRICES/PORES3.COO PORES3_COO MM0
++ ./MATRICES/PORES3 PORES3 HB
+  ./MATRICES/SHERMAN5.COO SHERMAN5 MM0
+- ./MATRICES/mat.coo small MM0
+-
+-
+-'MATRICES/SHERMAN5' 'SHERMAN5'
+-
+-first line is the number of matrices to be tested  [called numat in drivers] 
+- 
+-The second line gives the full path name of the file
+-and the name of the file, this may be something like
+-'/project/scicom00/DATA/MATRICES/MATRICES/SIMON/RAEFSKY6' 'RAEFSKY6'
+-the name is printed in the output table
+-
+-Repeat for as many matrices as indicated by numat

Modified: trunk/dports/math/itsol/files/patch-makefile.diff
===================================================================
--- trunk/dports/math/itsol/files/patch-makefile.diff	2015-12-09 23:58:28 UTC (rev 143301)
+++ trunk/dports/math/itsol/files/patch-makefile.diff	2015-12-10 02:54:10 UTC (rev 143302)
@@ -1,5 +1,5 @@
---- makefile.orig	2013-10-09 09:01:42.000000000 -0400
-+++ makefile	2013-10-09 09:02:10.000000000 -0400
+--- makefile.orig	2015-12-09 21:27:35.000000000 -0500
++++ makefile	2015-12-09 21:37:23.000000000 -0500
 @@ -1,30 +1,44 @@
 -# this makefile is for LINUX machines only 
 +VERSION = 2.0.0
@@ -57,3 +57,13 @@
  #
  clean :
  	rm -f ${OBJS} *~ core *.cache ${LIB} SRC/*~ SRC/*.cache
+@@ -32,3 +46,9 @@
+ cleanall :
+ 	rm -f ${OBJS} *~ core *.cache ${LIB} SRC/*~ SRC/*.cache \
+         TESTS/*.o TESTS/*.ex 
++
++test : testexe
++	cd TESTS && sh runall
++
++testexe :
++	$(MAKE) -C TESTS all LINKS="-L../LIB -litsol"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/94c1dead/attachment.html>