adjust tests for new message content when skipping

diff --git a/testing-drivers/testdata/incremental/harness/selectionTest.xml b/testing-drivers/testdata/incremental/harness/selectionTest.xml
index 7892f62b1a888f63986dbf4e09cb105392fdf27a..4f441069d6a50408fc53aba37d95de9ac4687f90 100644 (file)
--- 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 dd0ed82c3fa4ab4ce7c34d3b6f6706079dfa477e..dcd1d3dd32b0e3cf5d18a5b55da4ed28e1e08463 100644 (file)
--- 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() {