[Swift-commit] r4732 - trunk/tests/language/working
hategan at ci.uchicago.edu
hategan at ci.uchicago.edu
Sat Jul 2 17:39:52 CDT 2011
Author: hategan
Date: 2011-07-02 17:39:52 -0500 (Sat, 02 Jul 2011)
New Revision: 4732
Added:
trunk/tests/language/working/file_counter.swift.disabled
trunk/tests/language/working/q16.setup.sh
trunk/tests/language/working/q17.setup.sh
trunk/tests/language/working/q22.setup.sh
trunk/tests/language/working/q23.args
Removed:
trunk/tests/language/working/file_counter.swift
Modified:
trunk/tests/language/working/q17.swift
trunk/tests/language/working/q22.swift
trunk/tests/language/working/q7.swift
trunk/tests/language/working/tc.template.mix.data
Log:
updated tests
Deleted: trunk/tests/language/working/file_counter.swift
===================================================================
--- trunk/tests/language/working/file_counter.swift 2011-07-02 22:28:51 UTC (rev 4731)
+++ trunk/tests/language/working/file_counter.swift 2011-07-02 22:39:52 UTC (rev 4732)
@@ -1,20 +0,0 @@
-// a two-step workflow that essentially does
-// ls "*.txt" | wc
-
-type file {}
-
-(file f) ls (string s) {
- app {
- ls s stdout=@filename(f);
- }
-}
-
-(file c) wc (file f) {
- app {
- wc stdin=@filename(f) stdout=@filename(c);
- }
-}
-
-file list, count;
-list = ls("*.txt");
-count = wc(list);
Copied: trunk/tests/language/working/file_counter.swift.disabled (from rev 4722, trunk/tests/language/working/file_counter.swift)
===================================================================
--- trunk/tests/language/working/file_counter.swift.disabled (rev 0)
+++ trunk/tests/language/working/file_counter.swift.disabled 2011-07-02 22:39:52 UTC (rev 4732)
@@ -0,0 +1,20 @@
+// a two-step workflow that essentially does
+// ls "*.txt" | wc
+
+type file {}
+
+(file f) ls (string s) {
+ app {
+ ls s stdout=@filename(f);
+ }
+}
+
+(file c) wc (file f) {
+ app {
+ wc stdin=@filename(f) stdout=@filename(c);
+ }
+}
+
+file list, count;
+list = ls("*.txt");
+count = wc(list);
Added: trunk/tests/language/working/q16.setup.sh
===================================================================
--- trunk/tests/language/working/q16.setup.sh (rev 0)
+++ trunk/tests/language/working/q16.setup.sh 2011-07-02 22:39:52 UTC (rev 4732)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+echo "one two three" > q16.txt
Property changes on: trunk/tests/language/working/q16.setup.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/tests/language/working/q17.setup.sh
===================================================================
--- trunk/tests/language/working/q17.setup.sh (rev 0)
+++ trunk/tests/language/working/q17.setup.sh 2011-07-02 22:39:52 UTC (rev 4732)
@@ -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/working/q17.setup.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/tests/language/working/q17.swift
===================================================================
--- trunk/tests/language/working/q17.swift 2011-07-02 22:28:51 UTC (rev 4731)
+++ trunk/tests/language/working/q17.swift 2011-07-02 22:39:52 UTC (rev 4732)
@@ -7,7 +7,7 @@
}
}
-string inputNames = "one.txt two.txt three.txt";
+string inputNames[] = ["one.txt", "two.txt", "three.txt"];
messagefile inputfiles[] <array_mapper;files=inputNames>;
Added: trunk/tests/language/working/q22.setup.sh
===================================================================
--- trunk/tests/language/working/q22.setup.sh (rev 0)
+++ trunk/tests/language/working/q22.setup.sh 2011-07-02 22:39:52 UTC (rev 4732)
@@ -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/working/q22.setup.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/tests/language/working/q22.swift
===================================================================
--- trunk/tests/language/working/q22.swift 2011-07-02 22:28:51 UTC (rev 4731)
+++ trunk/tests/language/working/q22.swift 2011-07-02 22:39:52 UTC (rev 4732)
@@ -7,8 +7,8 @@
}
}
-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/working/q23.args
===================================================================
--- trunk/tests/language/working/q23.args (rev 0)
+++ trunk/tests/language/working/q23.args 2011-07-02 22:39:52 UTC (rev 4732)
@@ -0,0 +1 @@
+-text=Hello
\ No newline at end of file
Modified: trunk/tests/language/working/q7.swift
===================================================================
--- trunk/tests/language/working/q7.swift 2011-07-02 22:28:51 UTC (rev 4731)
+++ trunk/tests/language/working/q7.swift 2011-07-02 22:39:52 UTC (rev 4732)
@@ -6,7 +6,7 @@
}
}
-string outputNames = "one two three";
+string outputNames[] = ["one", "two", "three"];
file outputFiles[] <array_mapper;files=outputNames>;
Modified: trunk/tests/language/working/tc.template.mix.data
===================================================================
--- trunk/tests/language/working/tc.template.mix.data 2011-07-02 22:28:51 UTC (rev 4731)
+++ trunk/tests/language/working/tc.template.mix.data 2011-07-02 22:39:52 UTC (rev 4732)
@@ -1,3 +1,4 @@
localhost generate _DIR_/generate INSTALLED INTEL32::LINUX null
localhost process _DIR_/process INSTALLED INTEL32::LINUX null
-localhost combine _DIR_/combine INSTALLED INTEL32::LINUX null
\ No newline at end of file
+localhost combine _DIR_/combine INSTALLED INTEL32::LINUX null
+localhost wc /usr/bin/wc INSTALLED INTEL32::LINUX null
More information about the Swift-commit
mailing list