[Rcpp-commits] r879 - in pkg/Rcpp/inst: . unitTests

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

Author: romain
Date: 2010-03-12 10:04:19 +0100 (Fri, 12 Mar 2010)
New Revision: 879

Modified:
   pkg/Rcpp/inst/ChangeLog
   pkg/Rcpp/inst/unitTests/runit.environments.R
Log:
fix unit test so that the test works on OSX

Modified: pkg/Rcpp/inst/ChangeLog
===================================================================
--- pkg/Rcpp/inst/ChangeLog	2010-03-12 08:32:57 UTC (rev 878)
+++ pkg/Rcpp/inst/ChangeLog	2010-03-12 09:04:19 UTC (rev 879)
@@ -1,5 +1,7 @@
-2010-03-09  Romain Francois <romain at r-enthusiasts.com>
+2010-03-12  Romain Francois <romain at r-enthusiasts.com>
 
+	* inst/unitTests/runit.environments.R: mac os has a different locale
+
 	* src/Rcpp/traits/is_convertible.h: the detection is now performed without
 	the help of cxx0x or tr1 which makes it compatible with gcc 4.2
 	

Modified: pkg/Rcpp/inst/unitTests/runit.environments.R
===================================================================
--- pkg/Rcpp/inst/unitTests/runit.environments.R	2010-03-12 08:32:57 UTC (rev 878)
+++ pkg/Rcpp/inst/unitTests/runit.environments.R	2010-03-12 09:04:19 UTC (rev 879)
@@ -31,7 +31,7 @@
 	e$a <- 1:10
 	e$b <- "foo"
 	e$.c <- "hidden"
-	checkEquals( funx(e), c("a","b", ".c"), msg = "Environment::ls(true)" )
+	checkEquals( sort(funx(e)), sort(c("a","b", ".c")), msg = "Environment::ls(true)" )
 	checkEquals( funx(asNamespace("Rcpp")), ls(envir=asNamespace("Rcpp"), all = TRUE), 
 		msg = "Environment(namespace)::ls()" )