[Swift-commit] r4745 - trunk/tests/language-behaviour/IO
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Sat Jul 2 23:34:39 CDT 2011
Author: hategan
Date: 2011-07-02 23:34:39 -0500 (Sat, 02 Jul 2011)
New Revision: 4745
Added:
trunk/tests/language-behaviour/IO/130-fmri.0001.h.input.in
trunk/tests/language-behaviour/IO/130-fmri.0001.v.input.in
trunk/tests/language-behaviour/IO/130-fmri.0002.h.input.in
trunk/tests/language-behaviour/IO/130-fmri.0002.v.input.in
trunk/tests/language-behaviour/IO/130-fmri.0003.h.input.in
trunk/tests/language-behaviour/IO/130-fmri.0003.v.input.in
trunk/tests/language-behaviour/IO/130-fmri.0004.h.input.in
trunk/tests/language-behaviour/IO/130-fmri.0004.v.input.in
trunk/tests/language-behaviour/IO/130-fmri.h.template.in
trunk/tests/language-behaviour/IO/130-fmri.v.template.in
trunk/tests/language-behaviour/IO/q22.setup.sh
trunk/tests/language-behaviour/IO/q23.args
trunk/tests/language-behaviour/IO/tc.template.mix.data
Removed:
trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log
trunk/tests/language-behaviour/IO/0011-echo.kml
trunk/tests/language-behaviour/IO/0011-echo.xml
trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log
trunk/tests/language-behaviour/IO/0012-echo-map.kml
trunk/tests/language-behaviour/IO/0012-echo-map.xml
trunk/tests/language-behaviour/IO/130-fmri.0001.h.in
trunk/tests/language-behaviour/IO/130-fmri.0001.v.in
trunk/tests/language-behaviour/IO/130-fmri.0002.h.in
trunk/tests/language-behaviour/IO/130-fmri.0002.v.in
trunk/tests/language-behaviour/IO/130-fmri.0003.h.in
trunk/tests/language-behaviour/IO/130-fmri.0003.v.in
trunk/tests/language-behaviour/IO/130-fmri.0004.h.in
trunk/tests/language-behaviour/IO/130-fmri.0004.v.in
trunk/tests/language-behaviour/IO/130-fmri.h.template
trunk/tests/language-behaviour/IO/130-fmri.v.template
Modified:
trunk/tests/language-behaviour/IO/130-fmri.swift
trunk/tests/language-behaviour/IO/q22.swift
Log:
fixed io tests
Deleted: trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log
===================================================================
--- trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/0011-echo-20110603-1140-rr21aum3.log 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1,111 +0,0 @@
-2011-06-03 11:40:08,649-0500 DEBUG Loader Max heap: 238616576
-2011-06-03 11:40:08,650-0500 DEBUG textfiles BEGIN SWIFTSCRIPT:
-type messagefile;
-
-app (messagefile t) greeting() {
- echo "hello" stdout=@filename(t);
-}
-
-messagefile outfile <"0011-echo.out">;
-
-outfile = greeting();
-
-
-
-2011-06-03 11:40:08,650-0500 DEBUG textfiles END SWIFTSCRIPT:
-2011-06-03 11:40:08,650-0500 INFO Loader 0011-echo.swift: source file is new. Recompiling.
-2011-06-03 11:40:09,279-0500 INFO Karajan Validation of XML intermediate file was successful
-2011-06-03 11:40:09,475-0500 DEBUG Loader setting: tc.file to: ./tc.data
-2011-06-03 11:40:09,475-0500 DEBUG textfiles using default sites file
-2011-06-03 11:40:09,493-0500 INFO VDL2ExecutionContext Stack dump:
-Level 1
-[iA = 0, iB = 0, bA = false, bB = false]
- vdl:instanceconfig = Swift configuration []
- vdl:operation = run
- PATH_SEPARATOR = /
- swift.home = /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/..
- #vdl:futureWrapperMap = org.griphyn.vdl.karajan.WrapperMap at 171f189
-
-
-2011-06-03 11:40:10,075-0500 INFO unknown Using sites file: /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/../etc/sites.xml
-2011-06-03 11:40:10,112-0500 INFO unknown Using tc.data: ./tc.data
-2011-06-03 11:40:10,212-0500 INFO AbstractScheduler Setting resources to: {localhost=localhost}
-2011-06-03 11:40:10,702-0500 INFO unknown Swift svn swift-r4543 cog-r3143
-
-2011-06-03 11:40:10,703-0500 INFO unknown RUNID id=run:20110603-1140-rr21aum3
-2011-06-03 11:40:10,767-0500 DEBUG greeting PROCEDURE line=3 thread=0-1 name=greeting
-2011-06-03 11:40:10,774-0500 INFO vdl:execute START thread=0-1 tr=echo
-2011-06-03 11:40:10,798-0500 INFO WeightedHostScoreScheduler CONTACT_SELECTED host=localhost, score=1.000
-2011-06-03 11:40:10,802-0500 INFO GlobalSubmitQueue No global submit throttle set. Using default (1024)
-2011-06-03 11:40:10,805-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,873-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,876-0500 INFO vdl:initshareddir START host=localhost - Initializing shared directory
-2011-06-03 11:40:10,880-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,899-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,902-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,904-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,908-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,912-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:10,914-0500 INFO vdl:initshareddir END host=localhost - Done initializing shared directory
-2011-06-03 11:40:10,917-0500 DEBUG vdl:execute2 THREAD_ASSOCIATION jobid=echo-1geu42bk thread=0-1-1 host=localhost replicationGroup=0geu42bk
-2011-06-03 11:40:10,925-0500 INFO vdl:createdirset START jobid=echo-1geu42bk host=localhost - Initializing directory structure
-2011-06-03 11:40:10,926-0500 INFO vdl:createdirset END jobid=echo-1geu42bk - Done initializing directory structure
-2011-06-03 11:40:10,926-0500 INFO vdl:dostagein START jobid=echo-1geu42bk - Staging in files
-2011-06-03 11:40:10,932-0500 INFO vdl:dostagein END jobid=echo-1geu42bk - Staging in finished
-2011-06-03 11:40:10,934-0500 DEBUG vdl:execute2 JOB_START jobid=echo-1geu42bk tr=echo arguments=[?:string = hello - Closed] tmpdir=0011-echo-20110603-1140-rr21aum3/jobs/1/echo-1geu42bk host=localhost
-2011-06-03 11:40:10,937-0500 DEBUG textfiles BEGIN TC:
-#This is the transformation catalog.
-#
-#It comes pre-configured with a number of simple transformations with
-#paths that are likely to work on a linux box. However, on some systems,
-#the paths to these executables will be different (for example, sometimes
-#some of these programs are found in /usr/bin rather than in /bin)
-#
-#NOTE WELL: fields in this file must be separated by tabs, not spaces; and
-#there must be no trailing whitespace at the end of each line.
-#
-# sitename transformation path INSTALLED platform profiles
-localhost echo /bin/echo INSTALLED INTEL32::LINUX null
-localhost cat /bin/cat INSTALLED INTEL32::LINUX null
-localhost ls /bin/ls INSTALLED INTEL32::LINUX null
-localhost grep /bin/grep INSTALLED INTEL32::LINUX null
-localhost sort /bin/sort INSTALLED INTEL32::LINUX null
-localhost paste /bin/paste INSTALLED INTEL32::LINUX null
-localhost cp /bin/cp INSTALLED INTEL32::LINUX null
-localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null
-localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null
-localhost touch /bin/touch INSTALLED INTEL32::LINUX null
-localhost sleep /bin/sleep INSTALLED INTEL32::LINUX null
-localhost delayedcat /home/Alberto/Swift/cog/modules/swift/tests/language-behaviour/delayedcat.sh INSTALLED INTEL32::LINUX null
-
-
-2011-06-03 11:40:10,937-0500 DEBUG textfiles END TC:
-2011-06-03 11:40:10,946-0500 INFO GridExec TASK_DEFINITION: Task(type=JOB_SUBMISSION, identity=urn:0-1-1-1307119210103) is /bin/bash shared/_swiftwrap echo-1geu42bk -jobdir 1 -scratch -e /bin/echo -out 0011-echo.out -err stderr.txt -i -d -if -of 0011-echo.out -k -cdmfile -status files -a hello
-2011-06-03 11:40:10,952-0500 INFO JobSubmissionTaskHandler Submit: in: /var/tmp/0011-echo-20110603-1140-rr21aum3 command: /bin/bash /var/tmp/0011-echo-20110603-1140-rr21aum3/shared/_swiftwrap echo-1geu42bk -jobdir 1 -scratch -e /bin/echo -out 0011-echo.out -err stderr.txt -i -d -if -of 0011-echo.out -k -cdmfile -status files -a hello
-2011-06-03 11:40:11,045-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:11,048-0500 DEBUG vdl:checkjobstatus START jobid=echo-1geu42bk
-2011-06-03 11:40:11,051-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:11,052-0500 INFO vdl:checkjobstatus SUCCESS jobid=echo-1geu42bk - Success file found
-2011-06-03 11:40:11,053-0500 DEBUG vdl:execute2 STAGING_OUT jobid=echo-1geu42bk
-2011-06-03 11:40:11,055-0500 INFO vdl:dostageout START jobid=echo-1geu42bk - Staging out files
-2011-06-03 11:40:11,056-0500 DEBUG vdl:dostageout stageouts: [[$, outfile:messagefile = ? - Open]]
-2011-06-03 11:40:11,064-0500 DEBUG vdl:dostageout FILE_STAGE_OUT_START srcname=0011-echo.out srcdir=0011-echo-20110603-1140-rr21aum3/shared/ srchost=localhost destdir= desthost=localhost provider=file
-2011-06-03 11:40:11,065-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:11,077-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:11,078-0500 DEBUG vdl:dostageout FILE_STAGE_OUT_END srcname=0011-echo.out srcdir=0011-echo-20110603-1140-rr21aum3/shared/ srchost=localhost destdir= desthost=localhost provider=file
-2011-06-03 11:40:11,083-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:11,092-0500 INFO vdl:dostageout END jobid=echo-1geu42bk - Staging out finished
-2011-06-03 11:40:11,097-0500 DEBUG vdl:execute2 JOB_END jobid=echo-1geu42bk
-2011-06-03 11:40:11,098-0500 INFO vdl:execute END_SUCCESS thread=0-1 tr=echo
-2011-06-03 11:40:11,100-0500 DEBUG greeting PROCEDURE_END line=3
-2011-06-03 11:40:11,113-0500 DEBUG vdl:mains Starting cleanups
-2011-06-03 11:40:11,116-0500 INFO vdl:cleanups START cleanups=[[0011-echo-20110603-1140-rr21aum3, localhost]]
-2011-06-03 11:40:11,118-0500 INFO vdl:cleanup START dir=0011-echo-20110603-1140-rr21aum3 host=localhost
-2011-06-03 11:40:11,119-0500 DEBUG vdl:cleanup cdmfile
-2011-06-03 11:40:11,123-0500 INFO GridExec TASK_DEFINITION: Task(type=JOB_SUBMISSION, identity=urn:0-1-1307119210114) is /bin/rm -rf 0011-echo-20110603-1140-rr21aum3
-2011-06-03 11:40:11,123-0500 INFO JobSubmissionTaskHandler Submit: in: /var/tmp command: /bin/rm -rf 0011-echo-20110603-1140-rr21aum3
-2011-06-03 11:40:11,123-0500 INFO LateBindingScheduler JobQueue: 0
-2011-06-03 11:40:11,130-0500 INFO vdl:cleanup END dir=0011-echo-20110603-1140-rr21aum3 host=localhost
-2011-06-03 11:40:11,131-0500 INFO vdl:cleanups END cleanups=[[0011-echo-20110603-1140-rr21aum3, localhost]]
-2011-06-03 11:40:11,132-0500 DEBUG vdl:mains Ending cleanups
-2011-06-03 11:40:11,158-0500 INFO Loader Swift finished with no errors
Deleted: trunk/tests/language-behaviour/IO/0011-echo.kml
===================================================================
--- trunk/tests/language-behaviour/IO/0011-echo.kml 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/0011-echo.kml 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1,70 +0,0 @@
-<project><!-- CACHE ID ee300c16-1a12-4e15-bc05-578b8e792831 -->
- <import file="sys.xml"/>
- <import file="scheduler.xml"/>
- <import file="rlog.xml"/>
- <import file="vdl.k"/>
- <types>
- <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="messagefile">
- <xs:restriction base="string"/>
- </xs:simpleType>
- </xs:schema>
- </types>
- <global name="swift#string#17000">
- <vdl:new type="string" value="hello" />
- </global>
- <element name="greeting" arguments="t">
- <parameterlog>
- <string>output</string>
- <string>t</string>
- <vdl:getdatasetprovenanceid var="{t}" />
- <string>{#thread}</string>
- </parameterlog>
- <log level="debug" message="PROCEDURE line=3 thread={#thread} name=greeting"/>
- <vdl:execute>
- <vdl:tr>echo</vdl:tr>
- <vdl:stageout var="{t}"/>
- <vdl:arguments>
- <variable>swift#string#17000</variable>
- </vdl:arguments>
- <vdl:stdout>
- <swiftscript:filename>
- <variable>t</variable>
- </swiftscript:filename>
- </vdl:stdout>
- </vdl:execute>
- <vdl:closedataset var="{t}"/>
- <log level="debug" message="PROCEDURE_END line=3"/></element>
-
- <set name="outfile">
- <vdl:new type="messagefile" dbgname="outfile" waitfor="88000">
- <vdl:mapping descriptor="single_file_mapper">
- <vdl:parameter name="file" value="0011-echo.out"/>
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>outfile</string>
- <vdl:getdatasetprovenanceid var="{outfile}" />
- <string>{#thread}</string>
- </parameterlog>
- <restartLog>
- <vdl:mains>
- <vdl:startprogressticker />
- <vdl:mainp>
- <sequentialWithID>
- <sequential>
- <greeting>
- <parallel>
- <variable>outfile</variable>
- </parallel>
- </greeting>
- <partialCloseDataset var="{outfile}" closeID="88000" />
- </sequential>
- </sequentialWithID>
- </vdl:mainp>
- <vdl:stopprogressticker />
- </vdl:mains>
- </restartLog>
-</project>
Deleted: trunk/tests/language-behaviour/IO/0011-echo.xml
===================================================================
--- trunk/tests/language-behaviour/IO/0011-echo.xml 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/0011-echo.xml 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1,29 +0,0 @@
-<program xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <types>
- <type>
- <typename>messagefile</typename>
- <typealias>string</typealias>
- <typestructure></typestructure>
- </type>
- </types>
- <procedure name="greeting" src="line 3">
-
- <output
- name="t" type="messagefile"
-
- xsi:nil="true" />
- <binding>
- <application src="line 3">
- <executable>echo</executable>
- <stdout><function name="filename">
- <variableReference>t</variableReference></function></stdout><stringConstant>hello</stringConstant> </application>
- </binding>
- </procedure>
- <variable name="outfile" type="messagefile" isGlobal="false"><file name="0011-echo.out"/></variable>
- <call proc="greeting" src="line 9">
- <output><variableReference>outfile</variableReference></output>
- </call>
-</program>
Deleted: trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log
===================================================================
--- trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/0012-echo-map-20110603-1140-n9omdlcb.log 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1,33 +0,0 @@
-2011-06-03 11:40:12,099-0500 DEBUG Loader Max heap: 238616576
-2011-06-03 11:40:12,100-0500 DEBUG textfiles BEGIN SWIFTSCRIPT:
-type messagefile;
-
-(messagefile t) greeting() {
- app {
- echo "hello" stdout=@filename(t);
- }
-}
-
-messagefile outfile <"0012-echo-map.out"> = greeting();
-
-
-
-
-2011-06-03 11:40:12,100-0500 DEBUG textfiles END SWIFTSCRIPT:
-2011-06-03 11:40:12,101-0500 INFO Loader 0012-echo-map.swift: source file is new. Recompiling.
-2011-06-03 11:40:12,683-0500 INFO Karajan Validation of XML intermediate file was successful
-2011-06-03 11:40:12,882-0500 DEBUG Loader setting: tc.file to: ./tc.data
-2011-06-03 11:40:12,882-0500 DEBUG textfiles using default sites file
-2011-06-03 11:40:12,900-0500 INFO VDL2ExecutionContext Stack dump:
-Level 1
-[iA = 0, iB = 0, bA = false, bB = false]
- vdl:instanceconfig = Swift configuration []
- vdl:operation = run
- PATH_SEPARATOR = /
- swift.home = /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/..
- #vdl:futureWrapperMap = org.griphyn.vdl.karajan.WrapperMap at d56b37
-
-
-2011-06-03 11:40:13,570-0500 INFO unknown Using sites file: /home/Alberto/Swift/cog/modules/swift/dist/swift-svn/bin/../etc/sites.xml
-2011-06-03 11:40:13,609-0500 INFO unknown Using tc.data: ./tc.data
-2011-06-03 11:40:13,715-0500 INFO AbstractScheduler Setting resources to: {localhost=localhost}
Deleted: trunk/tests/language-behaviour/IO/0012-echo-map.kml
===================================================================
--- trunk/tests/language-behaviour/IO/0012-echo-map.kml 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/0012-echo-map.kml 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1,70 +0,0 @@
-<project><!-- CACHE ID ee300c16-1a12-4e15-bc05-578b8e792831 -->
- <import file="sys.xml"/>
- <import file="scheduler.xml"/>
- <import file="rlog.xml"/>
- <import file="vdl.k"/>
- <types>
- <xs:schema targetNamespace="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:simpleType name="messagefile">
- <xs:restriction base="string"/>
- </xs:simpleType>
- </xs:schema>
- </types>
- <global name="swift#string#17000">
- <vdl:new type="string" value="hello" />
- </global>
- <element name="greeting" arguments="t">
- <parameterlog>
- <string>output</string>
- <string>t</string>
- <vdl:getdatasetprovenanceid var="{t}" />
- <string>{#thread}</string>
- </parameterlog>
- <log level="debug" message="PROCEDURE line=3 thread={#thread} name=greeting"/>
- <vdl:execute>
- <vdl:tr>echo</vdl:tr>
- <vdl:stageout var="{t}"/>
- <vdl:arguments>
- <variable>swift#string#17000</variable>
- </vdl:arguments>
- <vdl:stdout>
- <swiftscript:filename>
- <variable>t</variable>
- </swiftscript:filename>
- </vdl:stdout>
- </vdl:execute>
- <vdl:closedataset var="{t}"/>
- <log level="debug" message="PROCEDURE_END line=3"/></element>
-
- <set name="outfile">
- <vdl:new type="messagefile" dbgname="outfile" waitfor="88000">
- <vdl:mapping descriptor="single_file_mapper">
- <vdl:parameter name="file" value="0012-echo-map.out"/>
- </vdl:mapping>
- </vdl:new>
- </set>
- <parameterlog>
- <string>intermediate</string>
- <string>outfile</string>
- <vdl:getdatasetprovenanceid var="{outfile}" />
- <string>{#thread}</string>
- </parameterlog>
- <restartLog>
- <vdl:mains>
- <vdl:startprogressticker />
- <vdl:mainp>
- <sequentialWithID>
- <sequential>
- <greeting>
- <parallel>
- <variable>outfile</variable>
- </parallel>
- </greeting>
- <partialCloseDataset var="{outfile}" closeID="88000" />
- </sequential>
- </sequentialWithID>
- </vdl:mainp>
- <vdl:stopprogressticker />
- </vdl:mains>
- </restartLog>
-</project>
Deleted: trunk/tests/language-behaviour/IO/0012-echo-map.xml
===================================================================
--- trunk/tests/language-behaviour/IO/0012-echo-map.xml 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/0012-echo-map.xml 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1,29 +0,0 @@
-<program xmlns="http://ci.uchicago.edu/swift/2009/02/swiftscript"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <types>
- <type>
- <typename>messagefile</typename>
- <typealias>string</typealias>
- <typestructure></typestructure>
- </type>
- </types>
- <procedure name="greeting" src="line 3">
-
- <output
- name="t" type="messagefile"
-
- xsi:nil="true" />
- <binding>
- <application src="line 4">
- <executable>echo</executable>
- <stdout><function name="filename">
- <variableReference>t</variableReference></function></stdout><stringConstant>hello</stringConstant> </application>
- </binding>
- </procedure>
- <variable name="outfile" type="messagefile" isGlobal="false"><file name="0012-echo-map.out"/></variable>
- <call proc="greeting" src="line 9">
- <output><variableReference>outfile</variableReference></output>
- </call>
-</program>
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0001.h.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0001.h.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0001.h.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0001.h.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0001.h.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0001.h.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0001.v.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0001.v.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0001.v.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0001.v.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0001.v.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0001.v.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0002.h.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0002.h.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0002.h.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0002.h.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0002.h.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0002.h.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0002.v.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0002.v.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0002.v.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0002.v.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0002.v.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0002.v.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0003.h.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0003.h.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0003.h.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0003.h.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0003.h.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0003.h.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0003.v.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0003.v.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0003.v.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0003.v.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0003.v.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0003.v.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0004.h.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0004.h.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0004.h.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0004.h.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0004.h.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0004.h.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.0004.v.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0004.v.in 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.0004.v.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-qux
Added: trunk/tests/language-behaviour/IO/130-fmri.0004.v.input.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.0004.v.input.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.0004.v.input.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+qux
Deleted: trunk/tests/language-behaviour/IO/130-fmri.h.template
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.h.template 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.h.template 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-foo
Added: trunk/tests/language-behaviour/IO/130-fmri.h.template.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.h.template.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.h.template.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+foo
Modified: trunk/tests/language-behaviour/IO/130-fmri.swift
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.swift 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.swift 2011-07-03 04:34:39 UTC (rev 4745)
@@ -16,8 +16,8 @@
// inputs: 4 volumes and a reference volume
-volume inputs[] <simple_mapper;prefix="130-fmri.",suffix=".in">;
-volume template <simple_mapper;prefix="130-fmri.",suffix=".template">;
+volume inputs[] <simple_mapper;prefix="130-fmri.",suffix=".input.in">;
+volume template <simple_mapper;prefix="130-fmri.",suffix=".template.in">;
// align 4 volumes to reference volume
Deleted: trunk/tests/language-behaviour/IO/130-fmri.v.template
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.v.template 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/130-fmri.v.template 2011-07-03 04:34:39 UTC (rev 4745)
@@ -1 +0,0 @@
-foo
Added: trunk/tests/language-behaviour/IO/130-fmri.v.template.in
===================================================================
--- trunk/tests/language-behaviour/IO/130-fmri.v.template.in (rev 0)
+++ trunk/tests/language-behaviour/IO/130-fmri.v.template.in 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+foo
Added: trunk/tests/language-behaviour/IO/q22.setup.sh
===================================================================
--- trunk/tests/language-behaviour/IO/q22.setup.sh (rev 0)
+++ trunk/tests/language-behaviour/IO/q22.setup.sh 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo "eye" > one.txt
+echo "eye bee" > two.txt
+echo "eye bee see" > three.txt
\ No newline at end of file
Property changes on: trunk/tests/language-behaviour/IO/q22.setup.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/tests/language-behaviour/IO/q22.swift
===================================================================
--- trunk/tests/language-behaviour/IO/q22.swift 2011-07-03 04:16:46 UTC (rev 4744)
+++ trunk/tests/language-behaviour/IO/q22.swift 2011-07-03 04:34:39 UTC (rev 4745)
@@ -5,8 +5,8 @@
wc "-w" @filename(f) stdout=@filename(t);
}
-string inputNames = "one.txt two.txt three.txt";
-string outputNames = "one.count two.count three.count";
+string inputNames[] = ["one.txt", "two.txt", "three.txt"];
+string outputNames[] = ["one.count", "two.count", "three.count"];
messagefile inputfiles[] <array_mapper;files=inputNames>;
countfile outputfiles[] <array_mapper;files=outputNames>;
Added: trunk/tests/language-behaviour/IO/q23.args
===================================================================
--- trunk/tests/language-behaviour/IO/q23.args (rev 0)
+++ trunk/tests/language-behaviour/IO/q23.args 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+-text=Hello
\ No newline at end of file
Added: trunk/tests/language-behaviour/IO/tc.template.mix.data
===================================================================
--- trunk/tests/language-behaviour/IO/tc.template.mix.data (rev 0)
+++ trunk/tests/language-behaviour/IO/tc.template.mix.data 2011-07-03 04:34:39 UTC (rev 4745)
@@ -0,0 +1 @@
+localhost touch /usr/bin/touch INSTALLED INTEL32::LINUX null
More information about the Swift-commit
mailing list