summaryrefslogtreecommitdiffstats
path: root/testing-drivers
diff options
context:
space:
mode:
authoracolyer <acolyer>2004-08-19 12:29:04 +0000
committeracolyer <acolyer>2004-08-19 12:29:04 +0000
commit65c67a4e848311efb7402f5d06bd1a833720b94b (patch)
treefdb6a106aa7059922e42adb079516a04c4093514 /testing-drivers
parent2834a7c26b42b8d98af57ef9733ae94fa4aa4a5b (diff)
downloadaspectj-65c67a4e848311efb7402f5d06bd1a833720b94b.tar.gz
aspectj-65c67a4e848311efb7402f5d06bd1a833720b94b.zip
fix for Bugzilla Bug 37020
wrong line for method execution join point
Diffstat (limited to 'testing-drivers')
-rw-r--r--testing-drivers/testdata/incremental/harness/expClasses/exp/Main.classbin355 -> 414 bytes
-rw-r--r--testing-drivers/testdata/incremental/harness/suite.xml5
-rw-r--r--testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java2
3 files changed, 5 insertions, 2 deletions
diff --git a/testing-drivers/testdata/incremental/harness/expClasses/exp/Main.class b/testing-drivers/testdata/incremental/harness/expClasses/exp/Main.class
index fba840b69..fd25eb1dc 100644
--- a/testing-drivers/testdata/incremental/harness/expClasses/exp/Main.class
+++ b/testing-drivers/testdata/incremental/harness/expClasses/exp/Main.class
Binary files differ
diff --git a/testing-drivers/testdata/incremental/harness/suite.xml b/testing-drivers/testdata/incremental/harness/suite.xml
index 3a19813e5..129865499 100644
--- a/testing-drivers/testdata/incremental/harness/suite.xml
+++ b/testing-drivers/testdata/incremental/harness/suite.xml
@@ -89,12 +89,15 @@
<run class="main.Main"/>
</ajc-test>
+ <!-- this test cannot work with new AjAttribute.MethodDeclarationLineNumberAttribute attribute
+ since the attribute will be generated for the main method, and has a different reference
+ on each serialization
<ajc-test dir="expClasses" title="expected class tree" keywords="incremental-test" >
<compile files="Main.java">
<dir-changes expDir="exp"/>
</compile>
<run class="Main"/>
</ajc-test>
-
+ -->
</suite>
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
index 94cc99985..489723f8e 100644
--- a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java
@@ -99,7 +99,7 @@ public class HarnessSelectionTest extends TestCase {
String[] options = new String[]
{ "!verbose", "!eclipse",
};
- Exp exp = new Exp(7, 7, 0, 7, 0, 0, 0);
+ Exp exp = new Exp(6, 6, 0, 6, 0, 0, 0);
checkSelection(INCREMENTAL, options, "INFIX IGNORED", exp);
}