To protect your data, the CISO officer has suggested users to enable 2FA as soon as possible.
Currently 2.7% of users enabled 2FA.

Commit eff247fa authored by Andreas Sewe's avatar Andreas Sewe
Browse files

Addressed issue #3008044 (Using ${SCRATCH} throughout all .cnf files).

parent add023eb
...@@ -8,8 +8,8 @@ size small args "-seconds=30", ...@@ -8,8 +8,8 @@ size small args "-seconds=30",
"-simulation=sensor-network", "-simulation=sensor-network",
"-nodecount=2,1", "-nodecount=2,1",
"-stagger-start=1000000", "-stagger-start=1000000",
"test/tinyos/CntToRfm.elf", "${SCRATCH}/test/tinyos/CntToRfm.elf",
"test/tinyos/RfmToLeds.elf" "${SCRATCH}/test/tinyos/RfmToLeds.elf"
output output
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709; stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709;
...@@ -19,8 +19,8 @@ size default args "-seconds=30", ...@@ -19,8 +19,8 @@ size default args "-seconds=30",
"-simulation=sensor-network", "-simulation=sensor-network",
"-nodecount=4,2", "-nodecount=4,2",
"-stagger-start=1000000", "-stagger-start=1000000",
"test/tinyos/CntToRfm.elf", "${SCRATCH}/test/tinyos/CntToRfm.elf",
"test/tinyos/RfmToLeds.elf" "${SCRATCH}/test/tinyos/RfmToLeds.elf"
output output
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709; stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709;
...@@ -29,17 +29,17 @@ size large args "-seconds=30", ...@@ -29,17 +29,17 @@ size large args "-seconds=30",
"-simulation=sensor-network", "-simulation=sensor-network",
"-nodecount=7,3,7,2", "-nodecount=7,3,7,2",
"-stagger-start=1000000", "-stagger-start=1000000",
"test/tinyos/CntToRfm.elf", "${SCRATCH}/test/tinyos/CntToRfm.elf",
"test/tinyos/RfmToLeds.elf", "${SCRATCH}/test/tinyos/RfmToLeds.elf",
"test/tinyos/Surge.elf", "${SCRATCH}/test/tinyos/Surge.elf",
"test/tinyos/Blink_mica2.elf", "${SCRATCH}/test/tinyos/Blink_mica2.elf",
"test/tinyos/XnpOscopeRF.elf", "${SCRATCH}/test/tinyos/XnpOscopeRF.elf",
"test/tinyos/OscilloscopeRF.elf", "${SCRATCH}/test/tinyos/OscilloscopeRF.elf",
"test/tinyos/HighFrequencySampling.elf", "${SCRATCH}/test/tinyos/HighFrequencySampling.elf",
"test/tinyos/SenseToLeds.elf", "${SCRATCH}/test/tinyos/SenseToLeds.elf",
"test/tinyos/XnpRfmToLeds.elf", "${SCRATCH}/test/tinyos/XnpRfmToLeds.elf",
"test/tinyos/RadioSenseToLeds_mica2.elf", "${SCRATCH}/test/tinyos/RadioSenseToLeds_mica2.elf",
"test/tinyos/SecureTOSBase.elf"; "${SCRATCH}/test/tinyos/SecureTOSBase.elf";
output output
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709; stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709;
......
...@@ -31,11 +31,6 @@ public class Avrora extends Benchmark { ...@@ -31,11 +31,6 @@ public class Avrora extends Benchmark {
protected void prepare(String size) throws Exception { protected void prepare(String size) throws Exception {
super.prepare(size); super.prepare(size);
args = config.preprocessArgs(size, scratch); args = config.preprocessArgs(size, scratch);
/* Retarget input/output files into scratch directory */
for (int i = 0; i < args.length; i++) {
if (args[i].charAt(0) != '-')
args[i] = fileInScratch(args[i]);
}
} }
public void iterate(String size) throws Exception { public void iterate(String size) throws Exception {
......
...@@ -9,21 +9,21 @@ benchmark batik ...@@ -9,21 +9,21 @@ benchmark batik
* image files. * image files.
*/ */
size small args "-d","${SCRATCH}","-scriptSecurityOff","batik/mapWaadt.svg" size small args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/mapWaadt.svg"
output stdout digest 0xa8f2208c90a7e2223ff376e873fd7ddb0ece3db7, output stdout digest 0xa8f2208c90a7e2223ff376e873fd7ddb0ece3db7,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709, stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */; "mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */;
size default args "-d","${SCRATCH}","-scriptSecurityOff","batik/mapWaadt.svg","batik/mapSpain.svg","batik/sydney.svg" size default args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/mapWaadt.svg","${SCRATCH}/batik/mapSpain.svg","${SCRATCH}/batik/sydney.svg"
output stdout digest 0xc0ab3d5a06a755bdf7f758f1c656acbbc5aafc74, output stdout digest 0xc0ab3d5a06a755bdf7f758f1c656acbbc5aafc74,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709, stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */, "mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */,
"mapSpain.png" /* digest 0x74fb77a00cf405ad334528cb15266da8d8660257 */, "mapSpain.png" /* digest 0x74fb77a00cf405ad334528cb15266da8d8660257 */,
"sydney.png" /* digest 0x3deba206f9a89a6798bf39af029e22c3f13efe00 */; "sydney.png" /* digest 0x3deba206f9a89a6798bf39af029e22c3f13efe00 */;
size large args "-d","${SCRATCH}","-scriptSecurityOff","batik/mapWaadt.svg","batik/mapSpain.svg","batik/sydney.svg", size large args "-d","${SCRATCH}","-scriptSecurityOff","${SCRATCH}/batik/mapWaadt.svg","${SCRATCH}/batik/mapSpain.svg","${SCRATCH}/batik/sydney.svg",
"batik/asf-logo.svg","batik/moonPhases.svg","batik/batik3D.svg", "${SCRATCH}/batik/asf-logo.svg","${SCRATCH}/batik/moonPhases.svg","${SCRATCH}/batik/batik3D.svg",
"batik/strokeFont.svg" "${SCRATCH}/batik/strokeFont.svg"
output stdout digest 0x7b9a5d41084750e997c9899ef6ad3fa7a9c6d267, output stdout digest 0x7b9a5d41084750e997c9899ef6ad3fa7a9c6d267,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709, stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */, "mapWaadt.png" /* digest 0xa0617ca6035d7eaeb6ea02f949759c48d869f15b */,
......
...@@ -10,7 +10,6 @@ package org.dacapo.harness; ...@@ -10,7 +10,6 @@ package org.dacapo.harness;
import java.io.File; import java.io.File;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.Vector;
import org.dacapo.harness.Benchmark; import org.dacapo.harness.Benchmark;
import org.dacapo.parser.Config; import org.dacapo.parser.Config;
...@@ -34,30 +33,9 @@ public class Batik extends Benchmark { ...@@ -34,30 +33,9 @@ public class Batik extends Benchmark {
@Override @Override
protected void prepare(String size) throws Exception { protected void prepare(String size) throws Exception {
super.prepare(size); super.prepare(size);
String[] args = config.preprocessArgs(size, scratch); args = config.preprocessArgs(size, scratch);
Vector<String> newArgs = new Vector<String>(args.length + 2);
for (int i = 0; i < args.length; i++) {
if (args[i].charAt(0) == '-') {
if (args[i].equals("-m") || args[i].equals("-d")) {
newArgs.add(args[i]);
newArgs.add(args[++i]);
} else
newArgs.add(args[i]);
} else
newArgs.add((new File(scratch, args[i])).getPath());
}
String[] newArgStrings = (String[]) newArgs.toArray(new String[0]);
if (getVerbose()) {
for (int i = 0; i < newArgStrings.length; i++)
System.out.print(newArgStrings[i] + " ");
System.out.println();
}
this.args = newArgStrings;
} }
/**
* Args is a list of file names relative to the scratch directory
*/
public void iterate(String size) throws Exception { public void iterate(String size) throws Exception {
Object object = constructor.newInstance((Object) args); Object object = constructor.newInstance((Object) args);
method.invoke(object); method.invoke(object);
......
...@@ -7,11 +7,11 @@ benchmark fop ...@@ -7,11 +7,11 @@ benchmark fop
* 'small' uses debug mode ("-d"), which puts current stats in the output, * 'small' uses debug mode ("-d"), which puts current stats in the output,
* so we don't use stdout to validate small. * so we don't use stdout to validate small.
*/ */
size small args "-q", "fop/readme.fo", "-pdf", "readme.pdf" size small args "-q", "${SCRATCH}/fop/readme.fo", "-pdf", "${SCRATCH}/readme.pdf"
output stdout digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709, output stdout digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709; stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709;
size default args "-q", "fop/test.fo", "-ps", "test.ps" size default args "-q", "${SCRATCH}/fop/test.fo", "-ps", "${SCRATCH}/test.ps"
output stdout digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709, output stdout digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709; stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709;
......
...@@ -31,10 +31,6 @@ public class Fop extends Benchmark { ...@@ -31,10 +31,6 @@ public class Fop extends Benchmark {
protected void prepare(String size) throws Exception { protected void prepare(String size) throws Exception {
super.prepare(size); super.prepare(size);
args = config.preprocessArgs(size, scratch); args = config.preprocessArgs(size, scratch);
/* Retarget input/output files into scratch directory */
for (int i = 0; i < args.length; i++)
if (args[i].charAt(0) != '-')
args[i] = fileInScratch(args[i]);
} }
public void iterate(String size) throws Exception { public void iterate(String size) throws Exception {
......
...@@ -3,13 +3,13 @@ benchmark luindex ...@@ -3,13 +3,13 @@ benchmark luindex
thread-model single thread-model single
jars "luindex.jar", "lucene-core-2.4.jar", "lucene-demos-2.4.jar"; jars "luindex.jar", "lucene-core-2.4.jar", "lucene-demos-2.4.jar";
size small args "luindex/william/poetry" size small args "${SCRATCH}/luindex/william/poetry"
output stdout digest 0xebb11b9e1c56c6ef5620b890cca24ec773301388, output stdout digest 0xebb11b9e1c56c6ef5620b890cca24ec773301388,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709, stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"index/segments.gen" bytes 20, "index/segments.gen" bytes 20,
"index/segments_2" bytes 62; "index/segments_2" bytes 62;
size default args "luindex/william","luindex/kjv" size default args "${SCRATCH}/luindex/william","${SCRATCH}/luindex/kjv"
output stdout digest 0xc90792fce1594b4b9ea1b01d593aefe801e6e58b, output stdout digest 0xc90792fce1594b4b9ea1b01d593aefe801e6e58b,
stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709, stderr digest 0xda39a3ee5e6b4b0d3255bfef95601890afd80709,
"index/segments.gen" bytes 20, "index/segments.gen" bytes 20,
......
...@@ -63,7 +63,7 @@ public class Index { ...@@ -63,7 +63,7 @@ public class Index {
public void main(final File INDEX_DIR, final String[] args) throws IOException { public void main(final File INDEX_DIR, final String[] args) throws IOException {
IndexWriter writer = new IndexWriter(INDEX_DIR, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED); IndexWriter writer = new IndexWriter(INDEX_DIR, new StandardAnalyzer(), true, IndexWriter.MaxFieldLength.LIMITED);
for (int arg = 0; arg < args.length; arg++) { for (int arg = 0; arg < args.length; arg++) {
final File docDir = new File(scratch, args[arg]); final File docDir = new File(args[arg]);
if (!docDir.exists() || !docDir.canRead()) { if (!docDir.exists() || !docDir.canRead()) {
System.out.println("Document directory '" + docDir.getAbsolutePath() + "' does not exist or is not readable, please check the path"); System.out.println("Document directory '" + docDir.getAbsolutePath() + "' does not exist or is not readable, please check the path");
throw new IOException("Cannot read from document directory"); throw new IOException("Cannot read from document directory");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment