summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-05-28 15:34:32 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-05-28 15:34:32 +0000
commit0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47 (patch)
treed506f42b6847b9ece5240d062bb9e4b97a450019
parent5da8a164cdd276e191ab6429e5a64e02529bbe45 (diff)
downloadscala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.tar.gz
scala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.tar.bz2
scala-0b006e7762a8c3ec2f5d02c8c7c34b09511e6a47.zip
Re-enabled a number of previously disabled tests;
according to my tests, they all currently work.
-rw-r--r--test/files/jvm/JavaInteraction.check (renamed from test/disabled/jvm/JavaInteraction.check)0
-rw-r--r--test/files/jvm/JavaInteraction.scala (renamed from test/disabled/jvm/JavaInteraction.scala)0
-rw-r--r--test/files/jvm/libnatives-32.so (renamed from test/disabled/jvm/libnatives-32.so)bin5359 -> 5359 bytes
-rw-r--r--test/files/jvm/libnatives-64.so (renamed from test/disabled/jvm/libnatives-64.so)bin7466 -> 7466 bytes
-rw-r--r--test/files/jvm/libnatives.jnilib (renamed from test/disabled/jvm/libnatives.jnilib)bin8456 -> 8456 bytes
-rwxr-xr-xtest/files/jvm/mkLibNatives.bat (renamed from test/disabled/jvm/mkLibNatives.bat)0
-rwxr-xr-xtest/files/jvm/mkLibNatives.sh (renamed from test/disabled/jvm/mkLibNatives.sh)0
-rw-r--r--test/files/jvm/natives-32.dll (renamed from test/disabled/jvm/natives-32.dll)bin40960 -> 40960 bytes
-rw-r--r--test/files/jvm/natives.c (renamed from test/disabled/jvm/natives.c)0
-rw-r--r--test/files/jvm/natives.check (renamed from test/disabled/jvm/natives.check)0
-rw-r--r--test/files/jvm/natives.h (renamed from test/disabled/jvm/natives.h)0
-rw-r--r--test/files/jvm/natives.scala (renamed from test/disabled/jvm/natives.scala)0
-rw-r--r--test/files/pos/t1053.scala (renamed from test/disabled/pos/t1053.scala)0
-rw-r--r--test/files/pos/t2619.scala (renamed from test/disabled/pos/t2619.scala)0
-rw-r--r--test/files/pos/ticket2251.scala (renamed from test/disabled/pos/ticket2251.scala)0
-rw-r--r--test/files/run/json.scala (renamed from test/files/run/json.scala.disabled)8
-rw-r--r--test/files/run/stream_length.check (renamed from test/disabled/run/stream_length.check)0
-rw-r--r--test/files/run/stream_length.scala (renamed from test/disabled/run/stream_length.scala)0
18 files changed, 4 insertions, 4 deletions
diff --git a/test/disabled/jvm/JavaInteraction.check b/test/files/jvm/JavaInteraction.check
index fb9d3cdd8c..fb9d3cdd8c 100644
--- a/test/disabled/jvm/JavaInteraction.check
+++ b/test/files/jvm/JavaInteraction.check
diff --git a/test/disabled/jvm/JavaInteraction.scala b/test/files/jvm/JavaInteraction.scala
index 1316fad5d4..1316fad5d4 100644
--- a/test/disabled/jvm/JavaInteraction.scala
+++ b/test/files/jvm/JavaInteraction.scala
diff --git a/test/disabled/jvm/libnatives-32.so b/test/files/jvm/libnatives-32.so
index ccbcdd646f..ccbcdd646f 100644
--- a/test/disabled/jvm/libnatives-32.so
+++ b/test/files/jvm/libnatives-32.so
Binary files differ
diff --git a/test/disabled/jvm/libnatives-64.so b/test/files/jvm/libnatives-64.so
index 8cc6152057..8cc6152057 100644
--- a/test/disabled/jvm/libnatives-64.so
+++ b/test/files/jvm/libnatives-64.so
Binary files differ
diff --git a/test/disabled/jvm/libnatives.jnilib b/test/files/jvm/libnatives.jnilib
index daac50e3df..daac50e3df 100644
--- a/test/disabled/jvm/libnatives.jnilib
+++ b/test/files/jvm/libnatives.jnilib
Binary files differ
diff --git a/test/disabled/jvm/mkLibNatives.bat b/test/files/jvm/mkLibNatives.bat
index 100246af79..100246af79 100755
--- a/test/disabled/jvm/mkLibNatives.bat
+++ b/test/files/jvm/mkLibNatives.bat
diff --git a/test/disabled/jvm/mkLibNatives.sh b/test/files/jvm/mkLibNatives.sh
index ed80c24c3e..ed80c24c3e 100755
--- a/test/disabled/jvm/mkLibNatives.sh
+++ b/test/files/jvm/mkLibNatives.sh
diff --git a/test/disabled/jvm/natives-32.dll b/test/files/jvm/natives-32.dll
index a06c1da3e3..a06c1da3e3 100644
--- a/test/disabled/jvm/natives-32.dll
+++ b/test/files/jvm/natives-32.dll
Binary files differ
diff --git a/test/disabled/jvm/natives.c b/test/files/jvm/natives.c
index 7b6d7b5ba5..7b6d7b5ba5 100644
--- a/test/disabled/jvm/natives.c
+++ b/test/files/jvm/natives.c
diff --git a/test/disabled/jvm/natives.check b/test/files/jvm/natives.check
index 2265459198..2265459198 100644
--- a/test/disabled/jvm/natives.check
+++ b/test/files/jvm/natives.check
diff --git a/test/disabled/jvm/natives.h b/test/files/jvm/natives.h
index 0d360d3654..0d360d3654 100644
--- a/test/disabled/jvm/natives.h
+++ b/test/files/jvm/natives.h
diff --git a/test/disabled/jvm/natives.scala b/test/files/jvm/natives.scala
index 14ee4e1c1b..14ee4e1c1b 100644
--- a/test/disabled/jvm/natives.scala
+++ b/test/files/jvm/natives.scala
diff --git a/test/disabled/pos/t1053.scala b/test/files/pos/t1053.scala
index 1d4dfb637e..1d4dfb637e 100644
--- a/test/disabled/pos/t1053.scala
+++ b/test/files/pos/t1053.scala
diff --git a/test/disabled/pos/t2619.scala b/test/files/pos/t2619.scala
index 565bc9572b..565bc9572b 100644
--- a/test/disabled/pos/t2619.scala
+++ b/test/files/pos/t2619.scala
diff --git a/test/disabled/pos/ticket2251.scala b/test/files/pos/ticket2251.scala
index 7b6efb0ea0..7b6efb0ea0 100644
--- a/test/disabled/pos/ticket2251.scala
+++ b/test/files/pos/ticket2251.scala
diff --git a/test/files/run/json.scala.disabled b/test/files/run/json.scala
index 2e7ee4aa4d..ec0bad7ebe 100644
--- a/test/files/run/json.scala.disabled
+++ b/test/files/run/json.scala
@@ -8,7 +8,7 @@ object Test extends Application {
printJSON("{\"name\": \"va1ue\"}") // ticket #136
printJSON("{\"name\": { \"name1\": \"va1ue1\", \"name2\": \"va1ue2\" } }")
printJSON("{\"name\": \"\\u0022\"}")
- printJSON("{\"age\": 0}")
+ printJSON("{\"age\": 0}")
println
// from http://en.wikipedia.org/wiki/JSON
@@ -63,7 +63,7 @@ object Test extends Application {
// from http://json.org/example.html
val sample3 = """
{"web-app": {
- "servlet": [
+ "servlet": [
{
"servlet-name": "cofaxCDS",
"servlet-class": "org.cofax.cds.CDSServlet",
@@ -119,7 +119,7 @@ object Test extends Application {
{
"servlet-name": "cofaxAdmin",
"servlet-class": "org.cofax.cds.AdminServlet"},
-
+
{
"servlet-name": "fileServlet",
"servlet-class": "org.cofax.cds.FileServlet"},
@@ -146,7 +146,7 @@ object Test extends Application {
"cofaxAdmin": "/admin/*",
"fileServlet": "/static/*",
"cofaxTools": "/tools/*"},
-
+
"taglib": {
"taglib-uri": "cofax.tld",
"taglib-location": "/WEB-INF/tlds/cofax.tld"}
diff --git a/test/disabled/run/stream_length.check b/test/files/run/stream_length.check
index 9906de773c..9906de773c 100644
--- a/test/disabled/run/stream_length.check
+++ b/test/files/run/stream_length.check
diff --git a/test/disabled/run/stream_length.scala b/test/files/run/stream_length.scala
index 68e9cad5ac..68e9cad5ac 100644
--- a/test/disabled/run/stream_length.scala
+++ b/test/files/run/stream_length.scala