[H5r-commits] r53 - R tests

[noreply at r-forge.r-project.org]

Author: extemporaneousb
Date: 2011-07-01 19:36:51 +0200 (Fri, 01 Jul 2011)
New Revision: 53

Added:
   tests/Makefile
Modified:
   R/h5R.R
Log:

Added ability to normalize ~




Modified: R/h5R.R
===================================================================
--- R/h5R.R	2011-06-30 18:32:43 UTC (rev 52)
+++ R/h5R.R	2011-07-01 17:36:51 UTC (rev 53)
@@ -136,20 +136,19 @@
     return(.Object)
 
   mode <- match.arg(mode)
-  
   if (! file.exists(fileName) && mode == 'w') {
-    .myCall("h5R_create", fileName, package = "h5R")
+    .myCall("h5R_create", fileName)
   }
-  
   if (! file.exists(fileName)) {
     stop(paste("Unable to open file:", fileName, "does not exist."))
   }
-  x <- .myCall("h5R_open", fileName, if(mode == 'r') as.integer(0) else as.integer(1), package = "h5R")
 
+  ## convert the fileName - essentially for ~. 
+  fileName <- tools:::file_path_as_absolute(normalizePath(fileName))
+  x <- .myCall("h5R_open", fileName, if (mode == 'r') as.integer(0) else as.integer(1))
   if (is.null(x)) {
     stop(paste("Problem opening file:", fileName))
   }
-  
   .Object at ePtr <- x
   .Object at fileName <- fileName
   

Added: tests/Makefile
===================================================================
--- tests/Makefile	                        (rev 0)
+++ tests/Makefile	2011-07-01 17:36:51 UTC (rev 53)
@@ -0,0 +1,9 @@
+
+clean : 
+	rm -f *.Rout
+
+all :
+	R CMD BATCH --no-save testread.R &
+	R CMD BATCH --no-save testReadPoints.R &
+	R CMD BATCH --no-save testwrite.R &
+	R CMD BATCH --no-save crash.R &