diff options
| author | wisberg <wisberg> | 2003-10-29 08:51:54 +0000 |
|---|---|---|
| committer | wisberg <wisberg> | 2003-10-29 08:51:54 +0000 |
| commit | 7a01c23476bda528f577b9fe4861f40ad1086381 (patch) | |
| tree | 23fca178293130599afda0b42d6fe9fd859af5f2 /testing-drivers | |
| parent | a6691df972e5dcf5e955f9a75bbba36b7a591c9e (diff) | |
| download | aspectj-7a01c23476bda528f577b9fe4861f40ad1086381.tar.gz aspectj-7a01c23476bda528f577b9fe4861f40ad1086381.zip | |
adjust tests for new message content when skipping
Diffstat (limited to 'testing-drivers')
| -rw-r--r-- | testing-drivers/testdata/incremental/harness/selectionTest.xml | 4 | ||||
| -rw-r--r-- | testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testing-drivers/testdata/incremental/harness/selectionTest.xml b/testing-drivers/testdata/incremental/harness/selectionTest.xml index 7892f62b1..4f441069d 100644 --- a/testing-drivers/testdata/incremental/harness/selectionTest.xml +++ b/testing-drivers/testdata/incremental/harness/selectionTest.xml @@ -132,9 +132,9 @@ <run class="TestNoTester"/> </ajc-test> - <ajc-test dir="." title="skip - local invalid option -source 1.4" + <ajc-test dir="." title="skip - local invalid option -source1.4" keywords="requireKeyword,localInvalidOption" > - <compile files="TestNoTester.java" options="-source,1.4"/> + <compile files="TestNoTester.java" options="-source1.4"/> <run class="TestNoTester"/> </ajc-test> diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java index dd0ed82c3..dcd1d3dd3 100644 --- a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java +++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessSelectionTest.java @@ -164,7 +164,7 @@ public class HarnessSelectionTest extends TestCase { "-ajctestRequireKeywords=eclipseOptionSkip" }; Exp exp = new Exp(17, 0, 17, 0, 0, 0, 6); - checkSelection(SELECT, options, "no support in eclipse-based compiler", exp); + checkSelection(SELECT, options, "old ajc 1.0 option", exp); } public void testAjcEclipseConflict() { @@ -185,7 +185,7 @@ public class HarnessSelectionTest extends TestCase { "-ajctestSkipKeywords=skipUnenforcedAjcLimit" }; Exp exp = new Exp(17, 3, 14, 3, 0, 0, 6); - checkSelection(SELECT, options, "conflict between arg=!eclipse and global=^eclipse", exp); + checkSelection(SELECT, options, "force conflict between eclipse", exp); } public void testSinglePR() { |