Skip to content
Snippets Groups Projects
Commit b109f4d6 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

move Hello.class out of /tests

The test code assumes /tests contains shared objects.
parent ec3c215c
No related branches found
No related tags found
No related merge requests found
......@@ -16,6 +16,6 @@
/tests/tst-pthread.so: ./tests/tst-pthread.so
/tests/tst-malloc.so: ../../external/glibc-testsuite/build/debug/malloc/tst-malloc.so
/tests/tst-getcwd.so: ../../external/glibc-testsuite/build/debug/io/tst-getcwd.so
/tests/Hello.class: ./tests/hello/Hello.class
/java/Hello.class: ./tests/hello/Hello.class
/java.so: java.so
#/tests/read01.so: ../../external/ltp/build/debug/syscalls/read/read01.so
......@@ -973,6 +973,7 @@ void unpack_bootfs(void)
"/usr/lib/jvm/jre/lib",
"/usr/lib/jvm/jre/lib/amd64",
"/usr/lib/jvm/jre/lib/amd64/server",
"/java",
"/tests",
NULL,
};
......
......@@ -23,7 +23,7 @@ int main(int ac, char **av)
vm_args.version = JNI_VERSION_1_6;
JNI_GetDefaultJavaVMInitArgs(&vm_args);
std::vector<JavaVMOption> options;
options.push_back(mkoption("-Djava.class.path=/tests"));
options.push_back(mkoption("-Djava.class.path=/java"));
while (ac > 0 && av[0][0] == '-') {
options.push_back(mkoption(av[0]));
++av, --ac;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment