Make the test even yet a little less trivial.

(How do you eat an elephant? One bite at a time.)

Change-Id: Ibf2fd6794e05133642c7426fe4608d2b5a4b7592

2 files changed, 22 insertions, 1 deletions

diff --git a/luni/src/test/etc/loading-test-jar/build.sh b/luni/src/test/etc/loading-test-jar/build.sh
index f14f27e..0fa9639 100755
--- a/luni/src/test/etc/loading-test-jar/build.sh
+++ b/luni/src/test/etc/loading-test-jar/build.sh
@@ -14,6 +14,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Set up prog to be the path of this script, including following
+# symlinks, and set up progdir to be the fully-qualified pathname of
+# its directory.  Switch the current directory to progdir for the
+# remainder of the script.
+prog="$0"
+while [ -h "${prog}" ]; do
+    newProg=`/bin/ls -ld "${prog}"`
+    newProg=`expr "${newProg}" : ".* -> \(.*\)$"`
+    if expr "x${newProg}" : 'x/' >/dev/null; then
+        prog="${newProg}"
+    else
+        progdir=`dirname "${prog}"`
+        prog="${progdir}/${newProg}"
+    fi
+done
+oldwd=`pwd`
+progdir=`dirname "${prog}"`
+cd "${progdir}"
+
 rm -rf classes
 rm -rf classes.dex
 rm -rf loading-test.jar
@@ -21,7 +40,8 @@ rm -rf loading-test.jar
 mkdir classes
 javac -d classes *.java
 dx --dex --output=classes.dex classes
-jar cf loading-test.jar classes.dex
+jar cf loading-test.jar classes.dex -C resources .
 
 rm -rf classes
 rm -rf classes.dex
+mv loading-test.jar ../../resources/dalvik/system/
diff --git a/luni/src/test/etc/loading-test-jar/resources/test/Resource1.txt b/luni/src/test/etc/loading-test-jar/resources/test/Resource1.txt
new file mode 100644
index 0000000..fef87fc
--- /dev/null
+++ b/luni/src/test/etc/loading-test-jar/resources/test/Resource1.txt
@@ -0,0 +1 @@
+Muffins are tasty!