Skip to content

Commit b869e33

Browse files
authored
Fix for case when log files contain NUL (PR#27)
Fix for case when log files contain NUL
2 parents 64f48c2 + 09c7eb5 commit b869e33

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

test/edu/umass/cs/gnsclient/client/integrationtests/ServerIntegrationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ public static void setUpBeforeClass() throws Exception {
298298
numLogFiles = Integer.parseInt(temp);
299299
}
300300

301-
output = RunServer.command("cat " + logFiles + " | grep \"server ready\" | wc -l ", ".", false);
301+
output = RunServer.command("cat " + logFiles + " | grep -a \"server ready\" | wc -l ", ".", false);
302302
temp = output.get(0);
303303
temp = temp.replaceAll("\\s", "");
304304
int numServersUp = Integer.parseInt(temp);
305305
System.out.println(Integer.toString(numServersUp) + " out of " + Integer.toString(numServers) + " servers are ready.");
306306
while (numServersUp < numServers) {
307307
Thread.sleep(5000);
308-
output = RunServer.command("cat " + logFiles + " | grep \"server ready\" | wc -l ", ".", false);
308+
output = RunServer.command("cat " + logFiles + " | grep -a \"server ready\" | wc -l ", ".", false);
309309
temp = output.get(0);
310310
temp = temp.replaceAll("\\s", "");
311311
numServersUp = Integer.parseInt(temp);

0 commit comments

Comments
 (0)