Addressed issue #3056019 and related issues (fixed multiple system properties...

Addressed issue #3056019 and related issues (fixed multiple system properties during actual benchmark iteration).

benchmarks/bms/fop/harness/src/org/dacapo/harness/Fop.java

@@ -9,6 +9,7 @@
 package org.dacapo.harness;
 
 import java.io.File;
+import java.util.Properties;
 
 import org.dacapo.harness.Benchmark;
 import org.dacapo.parser.Config;
@@ -33,6 +34,33 @@ public class Fop extends Benchmark {
     args = config.preprocessArgs(size, scratch);
   }
 
+  @Override
+  public void augmentSystemProperties(Properties systemProperties) {
+
+    /*
+     * The benchmark attempts to access an external font cache under
+     * "${user.home}/.fop/fop-fonts.cache". Make sure that no such cache is
+     * found.
+     */
+    systemProperties.setProperty("user.home", fileInScratch(config.name));
+
+    /*
+     * Clear all logging-related system properties (except for
+     * "java.util.logging.config.file") to make sure that the default logging
+     * implementation is used.
+     */
+    systemProperties.remove("org.apache.commons.logging.LogFactory");
+    systemProperties.remove("org.apache.commons.logging.Log");
+    systemProperties.remove("org.apache.commons.logging.log");
+    systemProperties.remove("java.util.logging.manager");
+    systemProperties.remove("java.util.logging.config.class");
+
+    /*
+     * Make sure that JAXP debug messages are disabled.
+     */
+    systemProperties.remove("jaxp.debug");
+  }
+
   public void iterate(String size) throws Exception {
     method.invoke(null, new Object[] { args });
   }

benchmarks/harness/src/org/dacapo/harness/Benchmark.java

@@ -310,7 +310,7 @@ public abstract class Benchmark {
     }
     System.setProperty(TIMEOUT_DIALATION_PROPERTY, Benchmark.timeoutDialation);
 
-    final Properties augmentedSystemProperties = new Properties(savedSystemProperties);
+    final Properties augmentedSystemProperties = (Properties) savedSystemProperties.clone();
     augmentSystemProperties(augmentedSystemProperties);
     System.setProperties(augmentedSystemProperties);