Tweak Java e2e tests some more

Formatting of embedded test scripts
Extract myrmic.py to fixture dir
Some more DefaultEnvironment and tools limiting for performance

Signed-off-by: Mats Wichmann <mats@linux.com>

2 files changed, 25 insertions, 0 deletions

diff --git a/test/Java/Java-fixture/.exclude_tests b/test/Java/Java-fixture/.exclude_tests
index 37004e61f..ae036667b 100644
--- a/test/Java/Java-fixture/.exclude_tests
+++ b/test/Java/Java-fixture/.exclude_tests
@@ -1,2 +1,3 @@
 myjar.py
 myjavac.py
+myrmic.py
diff --git a/test/Java/Java-fixture/myrmic.py b/test/Java/Java-fixture/myrmic.py
new file mode 100644
index 000000000..877c1bed7
--- /dev/null
+++ b/test/Java/Java-fixture/myrmic.py
@@ -0,0 +1,24 @@
+import os
+import sys
+
+args = sys.argv[1:]
+while args:
+    arg = args[0]
+    if arg == '-d':
+        outdir = args[1]
+        args = args[1:]
+    elif arg == '-classpath':
+        args = args[1:]
+    elif arg == '-sourcepath':
+        args = args[1:]
+    else:
+        break
+    args = args[1:]
+for file in args:
+    out = os.path.join(outdir, file.lower().replace('.java', '.class'))
+    with open(file, 'rb') as infile, open(out, 'wb') as outfile:
+        for line in infile:
+            if not line.startswith(b'/*rmic*/'):
+                outfile.write(line)
+
+sys.exit(0)