summaryrefslogtreecommitdiff
path: root/test/disabled-windows
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-04-05 06:24:22 +0000
committerPaul Phillips <paulp@improving.org>2010-04-05 06:24:22 +0000
commite8a121e9e1ade3f283f42fceb3c18f30a8468f57 (patch)
treefc58111a69bb8940f7c5bd341fa3a8f097955403 /test/disabled-windows
parent28ed5c6b216463a6e5bd8f06986c35a2036bda3f (diff)
downloadscala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.gz
scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.bz2
scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.zip
If I work on this patch any longer without chec...
If I work on this patch any longer without checking in I will go stark raving mad. It is broken up into a couple pieces. This one is the changes to test/. It includes fixing a bunch of tests, removing deprecated constructs, moving jars used by tests to the most specific plausible location rather than having all jars on the classpath of all tests, and some filesystem layout change (continuations get their whole own srcpath.) This would be the world's most tedious review, so let's say no review. [Note: after this commit, I doubt things will build very smoothly until the rest of the partest changes follow. Which should only be seconds, but just in case.]
Diffstat (limited to 'test/disabled-windows')
-rw-r--r--test/disabled-windows/script/loadAndExecute.check1
-rwxr-xr-xtest/disabled-windows/script/loadAndExecute/lAndE1.scala3
-rwxr-xr-xtest/disabled-windows/script/loadAndExecute/lAndE2.scala1
-rwxr-xr-xtest/disabled-windows/script/loadAndExecute/loadAndExecute.scala3
-rwxr-xr-xtest/disabled-windows/script/utf8.bat11
-rw-r--r--test/disabled-windows/script/utf8.check2
-rwxr-xr-xtest/disabled-windows/script/utf8.scala26
7 files changed, 47 insertions, 0 deletions
diff --git a/test/disabled-windows/script/loadAndExecute.check b/test/disabled-windows/script/loadAndExecute.check
new file mode 100644
index 0000000000..ccd8cd6e37
--- /dev/null
+++ b/test/disabled-windows/script/loadAndExecute.check
@@ -0,0 +1 @@
+List(hello, world)
diff --git a/test/disabled-windows/script/loadAndExecute/lAndE1.scala b/test/disabled-windows/script/loadAndExecute/lAndE1.scala
new file mode 100755
index 0000000000..b20d1a9428
--- /dev/null
+++ b/test/disabled-windows/script/loadAndExecute/lAndE1.scala
@@ -0,0 +1,3 @@
+object Bop {
+ implicit def int2list(x: Int): List[String] = List("hello", "world")
+} \ No newline at end of file
diff --git a/test/disabled-windows/script/loadAndExecute/lAndE2.scala b/test/disabled-windows/script/loadAndExecute/lAndE2.scala
new file mode 100755
index 0000000000..ea15a04d86
--- /dev/null
+++ b/test/disabled-windows/script/loadAndExecute/lAndE2.scala
@@ -0,0 +1 @@
+import Bop._
diff --git a/test/disabled-windows/script/loadAndExecute/loadAndExecute.scala b/test/disabled-windows/script/loadAndExecute/loadAndExecute.scala
new file mode 100755
index 0000000000..2a9718382b
--- /dev/null
+++ b/test/disabled-windows/script/loadAndExecute/loadAndExecute.scala
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+scala -nocompdaemon -i lAndE1.scala lAndE2.scala -e 'println(5: List[String])'
diff --git a/test/disabled-windows/script/utf8.bat b/test/disabled-windows/script/utf8.bat
new file mode 100755
index 0000000000..8bc5c886f7
--- /dev/null
+++ b/test/disabled-windows/script/utf8.bat
@@ -0,0 +1,11 @@
+::#!
+:: utf8 - <description>.
+
+@echo off
+call scala -nocompdaemon %0 %*
+goto :eof
+::!#
+
+/*Comment Комментарий*/
+Console.println("QWERTY");
+Console.println("ЙЦУКЕН");
diff --git a/test/disabled-windows/script/utf8.check b/test/disabled-windows/script/utf8.check
new file mode 100644
index 0000000000..29dc0518ff
--- /dev/null
+++ b/test/disabled-windows/script/utf8.check
@@ -0,0 +1,2 @@
+QWERTY
+ЙЦУКЕН
diff --git a/test/disabled-windows/script/utf8.scala b/test/disabled-windows/script/utf8.scala
new file mode 100755
index 0000000000..f294498cd2
--- /dev/null
+++ b/test/disabled-windows/script/utf8.scala
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Checks if UTF-8 output makes it through unmangled.
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+SOURCE="$0";
+if $cygwin; then
+ if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ;
+then
+ format=mixed
+ else
+ format=windows
+ fi
+ SOURCE=`cygpath --$format "$SOURCE"`;
+fi
+
+exec scala -Dfile.encoding="UTF-8" -nocompdaemon "$SOURCE" "$@"
+!#
+
+/*Comment Комментарий*/
+Console.println("QWERTY");
+Console.println("ЙЦУКЕН");