7 files changed, 37 insertions, 2 deletions

diff --git a/test/files/jvm5/NestedAnnotations.java b/test/files/jvm5/NestedAnnotations.java
new file mode 100644
index 0000000000..8f2327dcce
--- /dev/null
+++ b/test/files/jvm5/NestedAnnotations.java
@@ -0,0 +1,25 @@
+package test;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+public class NestedAnnotations {
+
+  @OuterAnno(inner=@InnerAnno(name="inner"))
+  String field;
+
+  @Target({FIELD})
+  @Retention(RUNTIME)
+  public static @interface InnerAnno {
+    String name();
+  }
+
+  @Target({FIELD})
+  @Retention(RUNTIME)
+  public static @interface OuterAnno {
+    InnerAnno inner();
+  }
+}
diff --git a/test/files/jvm5/mkAnnotationsJar.sh b/test/files/jvm5/mkAnnotationsJar.sh
index 574c39f617..fb9141260a 100755
--- a/test/files/jvm5/mkAnnotationsJar.sh
+++ b/test/files/jvm5/mkAnnotationsJar.sh
@@ -24,6 +24,6 @@ JAR=${JAVA_HOME}/bin/jar
 # commands
 
 mkdir -p ${OBJDIR}
-${JAVAC} ${JAVAC_OPTIONS} -d ${OBJDIR} SourceAnnotation.java
+${JAVAC} ${JAVAC_OPTIONS} -d ${OBJDIR} SourceAnnotation.java NestedAnnotations.java
 ${JAR} cf ../lib/annotations.jar -C ${OBJDIR} .
 rm -rf ${OBJDIR}
diff --git a/test/files/jvm5/t0014.check b/test/files/jvm5/t0014.check
new file mode 100644
index 0000000000..bece7db7af
--- /dev/null
+++ b/test/files/jvm5/t0014.check
@@ -0,0 +1 @@
+test.NestedAnnotations
diff --git a/test/files/jvm5/t0014.scala b/test/files/jvm5/t0014.scala
new file mode 100644
index 0000000000..a1948702dc
--- /dev/null
+++ b/test/files/jvm5/t0014.scala
@@ -0,0 +1,5 @@
+object Test {
+  def main(args: Array[String]) {
+    println(classOf[test.NestedAnnotations].getName)
+  }
+}
diff --git a/test/files/lib/annotations.jar.desired.sha1 b/test/files/lib/annotations.jar.desired.sha1
index e0b68725c5..1a472fe7fc 100644
--- a/test/files/lib/annotations.jar.desired.sha1
+++ b/test/files/lib/annotations.jar.desired.sha1
@@ -1 +1 @@
-283564a7790aca840aea8d93695e823aa29ba8b3 ?annotations.jar
+62d9e4e081508683a46e8e567aaf85ff2bb96238 ?annotations.jar
diff --git a/test/files/script/second.check b/test/files/script/second.check
new file mode 100644
index 0000000000..a105b862a1
--- /dev/null
+++ b/test/files/script/second.check
@@ -0,0 +1 @@
+My second argument is arg2
diff --git a/test/files/script/second.scala b/test/files/script/second.scala
new file mode 100755
index 0000000000..cd7a1c5342
--- /dev/null
+++ b/test/files/script/second.scala
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+scala -e 'println("My second argument is " + args(1))'  arg1 arg2