diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-03-20 14:25:39 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-03-20 14:27:28 +0700 |
| commit | 29acb9063ace3558f9c8280b3f418a17ae15be8d (patch) | |
| tree | 1644902ce8be11f26caed5df9eacd96f47f5c923 /tests | |
| parent | 31b2d60b897d318bfbffde2d78dbc288f85db191 (diff) | |
| download | aspectj-29acb9063ace3558f9c8280b3f418a17ae15be8d.tar.gz aspectj-29acb9063ace3558f9c8280b3f418a17ae15be8d.zip | |
Fix test relying on JVM warning being stripped from output
The line in which warnings like "Archived non-system classes are
disabled because the java.system.class.loader property is specified"
appears can start with e.g."OpenJDK 64-Bit Server VM" or "Java
HotSpot(TM) 64-Bit Server VM". Therefore, an exact match on the former
worked on Linux, but not on Windows, or maybe the difference is
generally between Oracle and OpenJDK. anyway, I use Oracle on Windows
and my build failed. Now it is fixed because I made the match more
generic using a regex.
I also removed a now obsolete check for the occurrence of the stripped
line in test "JDK14 LTW with XML".
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml index 5565e91b7..652ddecd5 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ltw/ltw.xml @@ -511,7 +511,6 @@ <line text="Hello World!" /> </stdout> <stderr> - <line text="Archived non-system classes are disabled" vm="14+"/> <line text="TraceFactory.instance=" /> </stderr> </ant> @@ -550,11 +549,11 @@ </stdout> </ant> </ajc-test> -<!-- <ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server"> - <compile files="Parent.java" options="-outjar parent.jar"/> <compile files="Child.java" - options="-classpath parent.jar -outjar child.jar"/> <ant file="ant-server.xml" - target="TestServer with Parent and Child" verbose="true"> <stdout> <line - text="Starting ..."/> <line text="Running Child"/> <line text="Parent"/> +<!-- <ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server"> + <compile files="Parent.java" options="-outjar parent.jar"/> <compile files="Child.java" + options="-classpath parent.jar -outjar child.jar"/> <ant file="ant-server.xml" + target="TestServer with Parent and Child" verbose="true"> <stdout> <line + text="Starting ..."/> <line text="Running Child"/> <line text="Parent"/> <line text="Child"/> <line text="Stopping ..."/> </stdout> </ant> </ajc-test> --> <ajc-test dir="ltw" title="TestServer with Parent and Child" keywords="ltw,server"> @@ -657,8 +656,8 @@ files="MultipleDumpTest.java, Class1.java, Class2.java, Class3.java" options="-1.5" /> <compile files="Aspect.aj" options="-1.5 -outxml -Xlint:ignore" /> - <!-- <run class="MultipleDumpTest" ltw="aop-multipledumponerror.xml"> <stdout> - <line text="? AbortingMessageHandler.AbortingMessageHandler()"/> </stdout> + <!-- <run class="MultipleDumpTest" ltw="aop-multipledumponerror.xml"> <stdout> + <line text="? AbortingMessageHandler.AbortingMessageHandler()"/> </stdout> </run> --> <ant file="ant.xml" target="multiple dump on error" verbose="true"> <stdout> @@ -672,7 +671,7 @@ </stdout> </ant> </ajc-test> - - + + </suite> |