summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoraclement <aclement>2006-03-05 17:00:04 +0000
committeraclement <aclement>2006-03-05 17:00:04 +0000
commitb2259116b8731725743d255a85c894d6f998afb1 (patch)
treeedf9876f501cd6f8a35107c8da10a9fd72b7de7f /tests
parent1954377011ba95d032e7076ea37623a4c22020ac (diff)
downloadaspectj-b2259116b8731725743d255a85c894d6f998afb1.tar.gz
aspectj-b2259116b8731725743d255a85c894d6f998afb1.zip
fix for 130300: cause the mysterious disappearance of -XnoWeave
Diffstat (limited to 'tests')
-rw-r--r--tests/product/testScripts/cmdline11/script.sh2
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ajc150.xml4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java8
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml28
-rw-r--r--tests/src/org/aspectj/systemtest/inpath/InPathTests.java2
-rw-r--r--tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml2
7 files changed, 25 insertions, 25 deletions
diff --git a/tests/product/testScripts/cmdline11/script.sh b/tests/product/testScripts/cmdline11/script.sh
index acba65774..4f4581d74 100644
--- a/tests/product/testScripts/cmdline11/script.sh
+++ b/tests/product/testScripts/cmdline11/script.sh
@@ -94,7 +94,7 @@ runTest "$ajrt${PS}jars/weaveUserLib.jar" weaveUserLib
## 3: generate aspect library
compile -d classes \
-classpath "$ajrt" \
- -noweave \
+ -XterminateAfterCompilation \
-outjar jars/aspectLib.jar \
-argfile aspects.lst
#makeJar aspectLib
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 87a4eea60..ddb34ce61 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -833,8 +833,8 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("IllegalAccessError with around advice on interface method call not self");
}
- public void testIllegalAccessErrorWithAroundAdviceNoWeaveLTW_pr119657() {
- runTest("IllegalAccessError with around advice on interface method call using -XnoWeave and LTW");
+ public void testIllegalAccessErrorWithAroundAdviceTerminateAfterCompilationLTW_pr119657() {
+ runTest("IllegalAccessError with around advice on interface method call using -XterminateAfterCompilation and LTW");
}
public void testIllegalAccessErrorWithAroundAdviceLTW_pr119657() {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index c29a22fbd..38e72cb43 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -6165,9 +6165,9 @@
</run>
</ajc-test>
- <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using -XnoWeave and LTW">
+ <ajc-test dir="bugs150/pr119657" title="IllegalAccessError with around advice on interface method call using -XterminateAfterCompilation and LTW">
<compile files="services/account/StockQuoteServiceTest.java, services/accountdata/StockAccount.java, services/stockquote/StockQuoteService.java, services/stockquote/StockQuoteServiceImpl.java, services/account/AccountReport.java"/>
- <compile files="accounts/recovery/Recovery.aj" options="-XnoWeave"/>
+ <compile files="accounts/recovery/Recovery.aj" options="-XterminateAfterCompilation"/>
<run class="services.account.StockQuoteServiceTest" ltw="aop.xml">
<stdout>
<line text="Recovery.around() call(float services.stockquote.StockQuoteService.getQuote(String))"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
index eb4ad7445..d600cc223 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
@@ -36,8 +36,8 @@ public class AtAjLTWTests extends XMLBasedAjcTestCase {
runTest("RunThemAllWithJavacCompiledAndLTW");
}
- public void testAjcLTWPerClauseTest_XnoWeave() {
- runTest("AjcLTW PerClauseTest -XnoWeave");
+ public void testAjcLTWPerClauseTest_XterminateAfterCompilation() {
+ runTest("AjcLTW PerClauseTest -XterminateAfterCompilation");
}
public void testAjcLTWPerClauseTest_Xreweavable() {
@@ -48,8 +48,8 @@ public class AtAjLTWTests extends XMLBasedAjcTestCase {
runTest("JavaCAjcLTW PerClauseTest");
}
- public void testAjcLTWAroundInlineMungerTest_XnoWeave() {
- runTest("AjcLTW AroundInlineMungerTest -XnoWeave");
+ public void testAjcLTWAroundInlineMungerTest_XterminateAfterCompilation() {
+ runTest("AjcLTW AroundInlineMungerTest -XterminateAfterCompilation");
}
public void testAjcLTWAroundInlineMungerTest_Xreweavable() {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
index d355d866f..4a0da8d3c 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
@@ -5,10 +5,10 @@
<ant file="ajc-ant.xml" target="javac.ltw" verbose="true"/>
</ajc-test>
- <ajc-test dir="java5/ataspectj" title="AjcLTW PerClauseTest -XnoWeave">
+ <ajc-test dir="java5/ataspectj" title="AjcLTW PerClauseTest -XterminateAfterCompilation">
<compile
files="ataspectj/PerClauseTest.java,ataspectj/PerClauseTestAspects.java,ataspectj/TestHelper.java"
- options="-1.5 -XnoWeave"/>
+ options="-1.5 -XterminateAfterCompilation"/>
<ant file="ajc-ant.xml" target="ltw.PerClauseTest" verbose="true"/>
</ajc-test>
@@ -22,7 +22,7 @@
<ajc-test dir="java5/ataspectj" title="JavaCAjcLTW PerClauseTest">
<compile
files="ataspectj/PerClauseTest.java,ataspectj/TestHelper.java,ataspectj/PerClauseTestAspects.java"
- options="-1.5 -XnoWeave"/>
+ options="-1.5 -XterminateAfterCompilation"/>
<comment>
aspectOf methods will be pushed in, ignore warning for adviceDidNotMatch but still do the logic for them
since such just added methods are an interesting case (percflow ajc$perCflowStack advice)
@@ -35,10 +35,10 @@
<ant file="ajc-ant.xml" target="ltw.PerClauseTest" verbose="true"/>
</ajc-test>
- <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest -XnoWeave">
+ <ajc-test dir="java5/ataspectj" title="AjcLTW AroundInlineMungerTest -XterminateAfterCompilation">
<compile
files="ataspectj/AroundInlineMungerTest.java,ataspectj/AroundInlineMungerTestAspects.java,ataspectj/TestHelper.java"
- options="-1.5 -XnoWeave"/>
+ options="-1.5 -XterminateAfterCompilation"/>
<ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest" verbose="true"/>
</ajc-test>
@@ -140,7 +140,7 @@
/>
<compile
files="ataspectj/ltwlog/Aspect1.java"
- options="-1.5 -XnoWeave"
+ options="-1.5 -XterminateAfterCompilation"
>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-silent.xml">
@@ -159,7 +159,7 @@
/>
<compile
files="ataspectj/ltwlog/Aspect1.java"
- options="-1.5 -XnoWeave"
+ options="-1.5 -XterminateAfterCompilation"
>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verbose.xml">
@@ -184,7 +184,7 @@
/>
<compile
files="ataspectj/ltwlog/Aspect1.java"
- options="-1.5 -XnoWeave"
+ options="-1.5 -XterminateAfterCompilation"
>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-verboseandshow.xml">
@@ -210,7 +210,7 @@
/>
<compile
files="ataspectj/ltwlog/Aspect1.java"
- options="-1.5 -XnoWeave"
+ options="-1.5 -XterminateAfterCompilation"
>
</compile>
<run class="ataspectj.ltwlog.Main" ltw="ataspectj/ltwlog/aop-messagehandler.xml">
@@ -259,7 +259,7 @@
<ajc-test dir="java5/ataspectj" title="Concrete@Aspect">
<compile
files="ataspectj/ConcreteAtAspectTest.java,ataspectj/TestHelper.java"
- options="-1.5 -XnoWeave"
+ options="-1.5 -XterminateAfterCompilation"
/>
<run class="ataspectj.ConcreteAtAspectTest" ltw="ataspectj/aop-concreteataspect.xml"/>
</ajc-test>
@@ -267,7 +267,7 @@
<ajc-test dir="java5/ataspectj" title="ConcreteAspect">
<compile
files="ataspectj/ConcreteAspectTest.aj,ataspectj/TestHelper.java"
- options="-1.5 -Xdev:NoAtAspectJProcessing -XnoWeave"
+ options="-1.5 -Xdev:NoAtAspectJProcessing -XterminateAfterCompilation"
/>
<run class="ataspectj.ConcreteAspectTest" ltw="ataspectj/aop-concreteaspect.xml"/>
</ajc-test>
@@ -275,7 +275,7 @@
<ajc-test dir="java5/ataspectj" title="ConcretePrecedenceAspect">
<compile
files="ataspectj/ConcretePrecedenceAspectTest.java,ataspectj/TestHelper.java"
- options="-1.5 -Xdev:NoAtAspectJProcessing -XnoWeave"
+ options="-1.5 -Xdev:NoAtAspectJProcessing -XterminateAfterCompilation"
/>
<run class="ataspectj.ConcretePrecedenceAspectTest" ltw="ataspectj/aop-concreteprecedenceaspect.xml"/>
</ajc-test>
@@ -283,14 +283,14 @@
<ajc-test dir="java5/ataspectj" title="AspectOfWhenAspectNotInInclude">
<compile
files="ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java,ataspectj/TestHelper.java"
- options="-1.5 -XnoWeave"/>
+ options="-1.5 -XterminateAfterCompilation"/>
<run class="ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest" ltw="ataspectj/bugs/aop-aspectofwhenaspectnotinincludetest.xml"/>
</ajc-test>
<ajc-test dir="java5/ataspectj" title="AppContainer">
<compile
files="ataspectj/hierarchy/AppContainerTest.java,ataspectj/hierarchy/app/SubApp.java,ataspectj/TestHelper.java"
- options="-1.5 -XnoWeave"
+ options="-1.5 -XterminateAfterCompilation"
/>
<ant file="ajc-ant.xml" target="ltw.AppContainer" verbose="true"/>
</ajc-test>
diff --git a/tests/src/org/aspectj/systemtest/inpath/InPathTests.java b/tests/src/org/aspectj/systemtest/inpath/InPathTests.java
index cecb3e85f..67492da97 100644
--- a/tests/src/org/aspectj/systemtest/inpath/InPathTests.java
+++ b/tests/src/org/aspectj/systemtest/inpath/InPathTests.java
@@ -38,7 +38,7 @@ public class InPathTests extends org.aspectj.testing.XMLBasedAjcTestCase {
// test removed from suite since aspects are *always* generated reweavable
// public void test004(){
-// runTest("The compiler crashes when using aspect libraries created without using -noweave");
+// runTest("The compiler crashes when using aspect libraries created without using -terminateAfterCompilation");
// }
public void test005(){
diff --git a/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml b/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml
index 40d094614..81228ca9b 100644
--- a/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml
+++ b/tests/src/org/aspectj/systemtest/inpath/inpath-tests.xml
@@ -25,7 +25,7 @@
<ajc-test dir="new/options11" pr="36329"
comment="the line number might change, we're really interested only in the files here"
- title="The compiler crashes when using aspect libraries created without using -noweave">
+ title="The compiler crashes when using aspect libraries created without using -terminateAfterCompile">
<compile files="Main.java,injar.jar,Aspect.java,aspectlib1.jar,aspectlib2.jar">
<message kind="error" line="0"/>
</compile>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 10:09:49 +0000