commit 432abb6e8635e3dcac46648e158b5dc2c71b84fc
author Narayan Kamath <narayan@google.com> Wed Jan 21 11:36:50 2015 +0000
committer Narayan Kamath <narayan@google.com> Wed Jan 21 11:36:50 2015 +0000
tree 1007c843f22130b05c46a5abdbbe4b65f55ad544
parent 6dc0ed7247a7520bf14a89db9b4bc3015d3cdcb2

Fix ProcessTest#getErrorStream.

Broken by the move to toybox. Instead of double guessing the
error message, just assume that all "cat" variants (host / target etc.)
output the name of the "bad" paramater to the error stream.

Change-Id: If19fa737e0d3a3dd023185fa23854da3022020fa

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
index b87105b..1a73719 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
@@ -86,7 +86,7 @@
     assertEquals("", received);
 
     String stderr = readAndCloseStream(p.getErrorStream());
-    assertTrue(stderr, stderr.contains("unrecognized option") || stderr.contains("invalid option"));
+    assertTrue(stderr, stderr.contains("no-such-option"));
 
     p.waitFor();
     p.destroy();