[Swift-commit] r2155 - in trunk: src/org/griphyn/vdl/mapping/file tests/language-behaviour tests/sites tests/sites/coaster

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-07-29 02:49:23 -0500 (Tue, 29 Jul 2008)
New Revision: 2155

Added:
   trunk/tests/language-behaviour/0758-ext-mapper-array.sh
   trunk/tests/language-behaviour/0758-ext-mapper-array.swift
   trunk/tests/language-behaviour/0759-ext-mapper-array.sh
   trunk/tests/language-behaviour/0759-ext-mapper-array.swift
Modified:
   trunk/src/org/griphyn/vdl/mapping/file/ExternalMapper.java
   trunk/tests/sites/coaster/coaster-local.xml
   trunk/tests/sites/run-site
Log:
make external mapper static; tests for behaviour that now works

Modified: trunk/src/org/griphyn/vdl/mapping/file/ExternalMapper.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/file/ExternalMapper.java	2008-07-29 07:29:00 UTC (rev 2154)
+++ trunk/src/org/griphyn/vdl/mapping/file/ExternalMapper.java	2008-07-29 07:49:23 UTC (rev 2155)
@@ -139,6 +139,6 @@
 	}
 
 	public boolean isStatic() {
-		return false;
+		return true;
 	}
 }

Added: trunk/tests/language-behaviour/0758-ext-mapper-array.sh
===================================================================
--- trunk/tests/language-behaviour/0758-ext-mapper-array.sh	                        (rev 0)
+++ trunk/tests/language-behaviour/0758-ext-mapper-array.sh	2008-07-29 07:49:23 UTC (rev 2155)
@@ -0,0 +1,4 @@
+echo "[0] 0757-ext-mapper-array.AAA.out"
+echo "[1] 0757-ext-mapper-array.0.3.2.1.out"
+echo "[2] 0757-ext-mapper-array.____.out"
+


Property changes on: trunk/tests/language-behaviour/0758-ext-mapper-array.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/language-behaviour/0758-ext-mapper-array.swift
===================================================================
--- trunk/tests/language-behaviour/0758-ext-mapper-array.swift	                        (rev 0)
+++ trunk/tests/language-behaviour/0758-ext-mapper-array.swift	2008-07-29 07:49:23 UTC (rev 2155)
@@ -0,0 +1,13 @@
+type messagefile;
+
+(messagefile t) write(string s) { 
+    app {
+        echo s stdout=@filename(t);
+    }
+}
+
+messagefile outfile[] <ext; exec="./0758-ext-mapper-array.sh">;
+
+foreach f,i in [0:2] {
+ outfile[i] = write("slot X");
+}

Added: trunk/tests/language-behaviour/0759-ext-mapper-array.sh
===================================================================
--- trunk/tests/language-behaviour/0759-ext-mapper-array.sh	                        (rev 0)
+++ trunk/tests/language-behaviour/0759-ext-mapper-array.sh	2008-07-29 07:49:23 UTC (rev 2155)
@@ -0,0 +1,3 @@
+#!/bin/bash
+echo [0] 0759-ext-mapper-array.a.out
+echo [1] 0759-ext-mapper-array.q.out


Property changes on: trunk/tests/language-behaviour/0759-ext-mapper-array.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: trunk/tests/language-behaviour/0759-ext-mapper-array.swift
===================================================================
--- trunk/tests/language-behaviour/0759-ext-mapper-array.swift	                        (rev 0)
+++ trunk/tests/language-behaviour/0759-ext-mapper-array.swift	2008-07-29 07:49:23 UTC (rev 2155)
@@ -0,0 +1,12 @@
+type file;
+
+(file t[]) write() { 
+    app {
+        touch "0759-ext-mapper-array.a.out" "0759-ext-mapper-array.q.out";
+    }
+}
+
+file outfile[] <ext; exec="./0759-ext-mapper-array.sh">;
+
+outfile = write();
+

Modified: trunk/tests/sites/coaster/coaster-local.xml
===================================================================
--- trunk/tests/sites/coaster/coaster-local.xml	2008-07-29 07:29:00 UTC (rev 2154)
+++ trunk/tests/sites/coaster/coaster-local.xml	2008-07-29 07:49:23 UTC (rev 2155)
@@ -15,6 +15,7 @@
     <gridftp  url="local://localhost" />
     <execution provider="coaster" jobmanager="local:local" url="localhost" />
     <workdirectory >/var/tmp</workdirectory>
+    <profile namespace="globus" key="coastersPerNode">5</profile>
   </pool>
 
 </config>

Modified: trunk/tests/sites/run-site
===================================================================
--- trunk/tests/sites/run-site	2008-07-29 07:29:00 UTC (rev 2154)
+++ trunk/tests/sites/run-site	2008-07-29 07:49:23 UTC (rev 2155)
@@ -12,5 +12,5 @@
 
 export SWIFT_TEST_PARAMS="-sites.file ../sites/${SITE} -tc.file tmp.tc.data.sites"
 
-./run 061-cattwo 130-fmri 103-quote.swift 1032-singlequote.swift 1031-quote.swift 1033-singlequote.swift 141-space-in-filename 142-space-and-quotes
+./run 061-cattwo 0651-several-delay.swift 130-fmri 103-quote.swift 1032-singlequote.swift 1031-quote.swift 1033-singlequote.swift 141-space-in-filename 142-space-and-quotes
 #./run 061-cattwo