From 9794157b37fe44d3e19e8ec39daf45ddfaa27bf8 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Fri, 13 Sep 2024 15:42:56 -0700 Subject: [PATCH 1/5] [Gradle] Enable assertions for testLsf task Signed-off-by: Eddie Hung --- common.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/common.gradle b/common.gradle index fe48f9f07..42397cb46 100644 --- a/common.gradle +++ b/common.gradle @@ -146,4 +146,5 @@ task testLsf(type: JavaExec) { doFirst { project.mkdir(workingDir) } + enableAssertions = true } From 839dc9ec6eb332d14a1b25023747054e7312bd36 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 17 Sep 2024 09:41:01 -0700 Subject: [PATCH 2/5] Revert "[Gradle] Enable assertions for testLsf task" This reverts commit 9794157b37fe44d3e19e8ec39daf45ddfaa27bf8. Signed-off-by: Eddie Hung --- common.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/common.gradle b/common.gradle index 42397cb46..fe48f9f07 100644 --- a/common.gradle +++ b/common.gradle @@ -146,5 +146,4 @@ task testLsf(type: JavaExec) { doFirst { project.mkdir(workingDir) } - enableAssertions = true } From 77f2cd556deb8bc308a8263f55665d618a43ee32 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 17 Sep 2024 09:41:17 -0700 Subject: [PATCH 3/5] [LaunchTestsOnLsf] Invoke java with assertions enabled Signed-off-by: Eddie Hung --- .../com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java b/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java index ce030ef83..2193fff39 100644 --- a/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java +++ b/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java @@ -133,7 +133,8 @@ public static void main(String[] args) { int memMB = pair.getSecond()*1024; LSFJob job = new LSFJob(); job.setRunDir(toJobDir(pair.getFirst())); - job.setRapidWrightCommand(RunTest.class, memMB,'"'+testsJar.toString()+"\" \""+pair.getFirst()+'"'); + job.setRapidWrightCommand(RunTest.class, memMB, + "-ea \"" + testsJar + "\" \"" + pair.getFirst() + "\""); job.setLsfResourceMemoryLimit(memMB); jq.addJob(job); jobsToTests.put(job, pair.getFirst()); From 03764eadedd0710a5b9a71f3b7ed793c255381fe Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 17 Sep 2024 11:08:25 -0700 Subject: [PATCH 4/5] Revert "[LaunchTestsOnLsf] Invoke java with assertions enabled" This reverts commit b86852ba8d65dda6812a23ce370f1d0610ce3813. Signed-off-by: Eddie Hung --- .../com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java b/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java index 2193fff39..ce030ef83 100644 --- a/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java +++ b/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java @@ -133,8 +133,7 @@ public static void main(String[] args) { int memMB = pair.getSecond()*1024; LSFJob job = new LSFJob(); job.setRunDir(toJobDir(pair.getFirst())); - job.setRapidWrightCommand(RunTest.class, memMB, - "-ea \"" + testsJar + "\" \"" + pair.getFirst() + "\""); + job.setRapidWrightCommand(RunTest.class, memMB,'"'+testsJar.toString()+"\" \""+pair.getFirst()+'"'); job.setLsfResourceMemoryLimit(memMB); jq.addJob(job); jobsToTests.put(job, pair.getFirst()); From 22ae4685048d17f264963a38a82afdf5ce0abc12 Mon Sep 17 00:00:00 2001 From: Eddie Hung Date: Tue, 17 Sep 2024 11:33:33 -0700 Subject: [PATCH 5/5] [LaunchTestsOnLsf] Invoke java with assertions enabled Signed-off-by: Eddie Hung --- src/com/xilinx/rapidwright/util/Job.java | 3 ++- .../com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/xilinx/rapidwright/util/Job.java b/src/com/xilinx/rapidwright/util/Job.java index 3f3be0345..4cba6a023 100644 --- a/src/com/xilinx/rapidwright/util/Job.java +++ b/src/com/xilinx/rapidwright/util/Job.java @@ -108,9 +108,10 @@ public void setCommand(String command) { * @param memoryLimitMB maximum memory in MB * @param arguments command arguments as single string */ - public void setRapidWrightCommand(Class mainClass, int memoryLimitMB, String arguments) { + public void setRapidWrightCommand(Class mainClass, int memoryLimitMB, boolean enableAssertions, String arguments) { command = System.getProperty("java.home")+"/bin/java -cp " + System.getProperty("java.class.path") + " -Xmx"+memoryLimitMB+"m " + + (enableAssertions ? "-ea " : "") + mainClass.getCanonicalName()+" "+arguments; } diff --git a/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java b/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java index ce030ef83..3325f31cc 100644 --- a/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java +++ b/test/shared/com/xilinx/rapidwright/util/lsf/LaunchTestsOnLsf.java @@ -133,7 +133,8 @@ public static void main(String[] args) { int memMB = pair.getSecond()*1024; LSFJob job = new LSFJob(); job.setRunDir(toJobDir(pair.getFirst())); - job.setRapidWrightCommand(RunTest.class, memMB,'"'+testsJar.toString()+"\" \""+pair.getFirst()+'"'); + job.setRapidWrightCommand(RunTest.class, memMB, true, + '"'+testsJar.toString()+"\" \""+pair.getFirst()+'"'); job.setLsfResourceMemoryLimit(memMB); jq.addJob(job); jobsToTests.put(job, pair.getFirst());