[Swift-commit] r6913 - branches/release-0.94/tests/language-behaviour/IO

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-08-21 12:47:55 -0500 (Wed, 21 Aug 2013)
New Revision: 6913

Added:
   branches/release-0.94/tests/language-behaviour/IO/readStructured01.in
   branches/release-0.94/tests/language-behaviour/IO/readStructured02.in
   branches/release-0.94/tests/language-behaviour/IO/readStructured03.in
Removed:
   branches/release-0.94/tests/language-behaviour/IO/readStructured.in
   branches/release-0.94/tests/language-behaviour/IO/readStructured3.in
Modified:
   branches/release-0.94/tests/language-behaviour/IO/readData3.out.expected
   branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift
   branches/release-0.94/tests/language-behaviour/IO/readStructured02.swift
   branches/release-0.94/tests/language-behaviour/IO/readStructured03.swift
Log:
readStructure scripts: make sure input files match name of scripts so they get staged into work directory
readData3: Lack of newline in readData3.out.expected was causing test to fail
All tests should be passing now


Modified: branches/release-0.94/tests/language-behaviour/IO/readData3.out.expected
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readData3.out.expected	2013-08-21 17:43:53 UTC (rev 6912)
+++ branches/release-0.94/tests/language-behaviour/IO/readData3.out.expected	2013-08-21 17:47:55 UTC (rev 6913)
@@ -1 +1 @@
-9
\ No newline at end of file
+9

Deleted: branches/release-0.94/tests/language-behaviour/IO/readStructured.in
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured.in	2013-08-21 17:43:53 UTC (rev 6912)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured.in	2013-08-21 17:47:55 UTC (rev 6913)
@@ -1,2 +0,0 @@
-rows[0] = "hello"
-rows[1] = "World!"

Copied: branches/release-0.94/tests/language-behaviour/IO/readStructured01.in (from rev 6903, branches/release-0.94/tests/language-behaviour/IO/readStructured.in)
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured01.in	                        (rev 0)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured01.in	2013-08-21 17:47:55 UTC (rev 6913)
@@ -0,0 +1,2 @@
+rows[0] = "hello"
+rows[1] = "World!"

Modified: branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift	2013-08-21 17:43:53 UTC (rev 6912)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured01.swift	2013-08-21 17:47:55 UTC (rev 6913)
@@ -3,5 +3,5 @@
 }
 
 matrix m;
-m = readStructured("readStructured.in");
+m = readStructured("readStructured01.in");
 

Copied: branches/release-0.94/tests/language-behaviour/IO/readStructured02.in (from rev 6903, branches/release-0.94/tests/language-behaviour/IO/readStructured.in)
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured02.in	                        (rev 0)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured02.in	2013-08-21 17:47:55 UTC (rev 6913)
@@ -0,0 +1,2 @@
+rows[0] = "hello"
+rows[1] = "World!"

Modified: branches/release-0.94/tests/language-behaviour/IO/readStructured02.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured02.swift	2013-08-21 17:43:53 UTC (rev 6912)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured02.swift	2013-08-21 17:47:55 UTC (rev 6913)
@@ -3,8 +3,8 @@
 }
 
 matrix m;
-m = readStructured("readStructured.in");
+m = readStructured("readStructured02.in");
 
 foreach item,index in m.rows {
     tracef("Row[%i] : %s \n", index, item);
-}
\ No newline at end of file
+}

Added: branches/release-0.94/tests/language-behaviour/IO/readStructured03.in
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured03.in	                        (rev 0)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured03.in	2013-08-21 17:47:55 UTC (rev 6913)
@@ -0,0 +1,6 @@
+rows[0].columns[0] = 0
+rows[0].columns[1] = 2
+rows[0].columns[2] = 4
+rows[1].columns[0] = 1
+rows[1].columns[1] = 3
+rows[1].columns[2] = 5
\ No newline at end of file

Modified: branches/release-0.94/tests/language-behaviour/IO/readStructured03.swift
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured03.swift	2013-08-21 17:43:53 UTC (rev 6912)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured03.swift	2013-08-21 17:47:55 UTC (rev 6913)
@@ -6,4 +6,4 @@
 }
 
 matrix m;
-m = readStructured("readStructured3.in");
+m = readStructured("readStructured03.in");

Deleted: branches/release-0.94/tests/language-behaviour/IO/readStructured3.in
===================================================================
--- branches/release-0.94/tests/language-behaviour/IO/readStructured3.in	2013-08-21 17:43:53 UTC (rev 6912)
+++ branches/release-0.94/tests/language-behaviour/IO/readStructured3.in	2013-08-21 17:47:55 UTC (rev 6913)
@@ -1,6 +0,0 @@
-rows[0].columns[0] = 0
-rows[0].columns[1] = 2
-rows[0].columns[2] = 4
-rows[1].columns[0] = 1
-rows[1].columns[1] = 3
-rows[1].columns[2] = 5
\ No newline at end of file