[Swift-commit] r4113 - in SwiftApps/SwiftR: Swift/R mxtests/swift

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-02-17 12:05:36 -0600 (Thu, 17 Feb 2011)
New Revision: 4113

Modified:
   SwiftApps/SwiftR/Swift/R/Bench.R
   SwiftApps/SwiftR/Swift/R/TestFramework.R
   SwiftApps/SwiftR/Swift/R/Tests.R
   SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R
Log:
Renamed test suite attribute "tests" to "groups" for clarity and to eliminate ambiguity with the property of the group


Modified: SwiftApps/SwiftR/Swift/R/Bench.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Bench.R	2011-02-17 16:51:50 UTC (rev 4112)
+++ SwiftApps/SwiftR/Swift/R/Bench.R	2011-02-17 18:05:36 UTC (rev 4113)
@@ -88,7 +88,7 @@
     swiftTestSuite <- list(
             setup=function () { initSwiftTestOptions();
                                swiftInit() }, # swiftInit controlled via options
-            tests=list(warmUpGroup, perfTestGroup1), 
+            groups=list(warmUpGroup, perfTestGroup1), 
             teardown=function () { swiftShutdown() })
     return (swiftTestSuite)
 }

Modified: SwiftApps/SwiftR/Swift/R/TestFramework.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/TestFramework.R	2011-02-17 16:51:50 UTC (rev 4112)
+++ SwiftApps/SwiftR/Swift/R/TestFramework.R	2011-02-17 18:05:36 UTC (rev 4113)
@@ -130,19 +130,19 @@
     }
 }
 
-makeTestSuite <- function(tests, setup=NULL, teardown=NULL) {
-    return (list(tests=tests, setup=setup, teardown=teardown))
+makeTestSuite <- function(groups, setup=NULL, teardown=NULL) {
+    return (list(groups=groups, setup=setup, teardown=teardown))
 }
 
 runTestSuite <- function (suite) {
     if (!is.null(suite$setup))
         suite$setup()
     resSuite <- suite
-    resSuite$tests <- lapply(suite$tests, runTestGroup)
+    resSuite$groups <- lapply(suite$groups, runTestGroup)
     
     if (!is.null(suite$teardown))
         suite$teardown()
 
-    lapply(resSuite$tests, printTestGroup)
+    lapply(resSuite$groups, printTestGroup)
     return (resSuite)
 }

Modified: SwiftApps/SwiftR/Swift/R/Tests.R
===================================================================
--- SwiftApps/SwiftR/Swift/R/Tests.R	2011-02-17 16:51:50 UTC (rev 4112)
+++ SwiftApps/SwiftR/Swift/R/Tests.R	2011-02-17 18:05:36 UTC (rev 4113)
@@ -660,7 +660,7 @@
 swiftTestSuite <- makeTestSuite(
         setup=function () { initSwiftTestOptions();
                            swiftInit() }, # swiftInit controlled via options
-        tests=list(testGroup1.1, testGroup2, testGroup1.2, testGroup1.3, testGroup3, testGroup4,
+        groups=list(testGroup1.1, testGroup2, testGroup1.2, testGroup1.3, testGroup3, testGroup4,
             testGroup5), 
         teardown=function () { swiftShutdown() })
 

Modified: SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R
===================================================================
--- SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R	2011-02-17 16:51:50 UTC (rev 4112)
+++ SwiftApps/SwiftR/mxtests/swift/BootstrapParallelBigger.R	2011-02-17 18:05:36 UTC (rev 4113)
@@ -156,7 +156,7 @@
 }
 
 swiftTestSuite <- makeTestSuite(
-    tests=list(
+    groups=list(
        # 16 cores
        makeBootstrapTestGroup(mode="swift", server="ssh", cores=2, 
             hosts=c("nettle", "wapato", "dandelion", "cattail", 
@@ -178,7 +178,7 @@
        ))
 
 padsTestSuite <- makeTestSuite(
-    tests=list(
+    groups=list(
        makeBootstrapTestGroup(mode="swift", server="pbs", cores=1, nodes=1), 
        makeBootstrapTestGroup(mode="swift", server="pbs", cores=8, nodes=1), 
        makeBootstrapTestGroup(mode="swift", server="pbs", cores=8, nodes=2),