From 21fc10d3deff53f5c7d5aff4ca8c799e26d5b8a3 Mon Sep 17 00:00:00 2001 From: Alexey Rybalchenko Date: Thu, 30 Nov 2017 17:05:38 +0100 Subject: [PATCH] Disable irrelevant output in tests to workaround output scrambling on MacOS 10.11 --- examples/MQ/1-sampler-sink/testMQEx1.sh.in | 1 + examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in | 3 +++ examples/MQ/4-copypush/testMQEx4.sh.in | 2 ++ examples/MQ/5-req-rep/testMQEx5.sh.in | 1 + examples/MQ/6-multiple-channels/testMQEx6.sh.in | 2 ++ examples/MQ/8-multipart/testMQEx8.sh.in | 1 + examples/MQ/multiple-transports/testMTEx.sh.in | 2 ++ 7 files changed, 12 insertions(+) diff --git a/examples/MQ/1-sampler-sink/testMQEx1.sh.in b/examples/MQ/1-sampler-sink/testMQEx1.sh.in index 434ad500..baee2ec8 100755 --- a/examples/MQ/1-sampler-sink/testMQEx1.sh.in +++ b/examples/MQ/1-sampler-sink/testMQEx1.sh.in @@ -7,6 +7,7 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SI SAMPLER="ex1-sampler" SAMPLER+=" --id sampler1" +SAMPLER+=" --verbosity NOLOG" SAMPLER+=" --control static --log-color false" SAMPLER+=" --max-iterations 1" SAMPLER+=" --mq-config $ex1config" diff --git a/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in b/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in index 831023df..6ef1a3cc 100755 --- a/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in +++ b/examples/MQ/2-sampler-processor-sink/testMQEx2.sh.in @@ -7,6 +7,7 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; kill -TERM $PROCESSOR1_PID; SAMPLER="ex2-sampler" SAMPLER+=" --id sampler1" +SAMPLER+=" --verbosity NOLOG" SAMPLER+=" --control static --log-color false" SAMPLER+=" --max-iterations 2" SAMPLER+=" --mq-config $ex2config" @@ -15,6 +16,7 @@ SAMPLER_PID=$! PROCESSOR1="ex2-processor" PROCESSOR1+=" --id processor1" +PROCESSOR1+=" --verbosity NOLOG" PROCESSOR1+=" --control static --log-color false" PROCESSOR1+=" --mq-config $ex2config" PROCESSOR1+=" --config-key processor" @@ -23,6 +25,7 @@ PROCESSOR1_PID=$! PROCESSOR2="ex2-processor" PROCESSOR2+=" --id processor2" +PROCESSOR2+=" --verbosity NOLOG" PROCESSOR2+=" --control static --log-color false" PROCESSOR2+=" --mq-config $ex2config" PROCESSOR2+=" --config-key processor" diff --git a/examples/MQ/4-copypush/testMQEx4.sh.in b/examples/MQ/4-copypush/testMQEx4.sh.in index 5ff37e0b..0e25cd35 100755 --- a/examples/MQ/4-copypush/testMQEx4.sh.in +++ b/examples/MQ/4-copypush/testMQEx4.sh.in @@ -7,6 +7,7 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK1_PID; kill -TERM $SINK2_PID; wai SAMPLER="ex4-sampler" SAMPLER+=" --id sampler1" +SAMPLER+=" --verbosity NOLOG" SAMPLER+=" --control static --log-color false" SAMPLER+=" --max-iterations 1" SAMPLER+=" --mq-config $ex4config" @@ -15,6 +16,7 @@ SAMPLER_PID=$! SINK1="ex4-sink" SINK1+=" --id sink1" +SINK1+=" --verbosity NOLOG" SINK1+=" --control static --log-color false" SINK1+=" --max-iterations 1" SINK1+=" --mq-config $ex4config" diff --git a/examples/MQ/5-req-rep/testMQEx5.sh.in b/examples/MQ/5-req-rep/testMQEx5.sh.in index 6e95502e..ad7f7623 100755 --- a/examples/MQ/5-req-rep/testMQEx5.sh.in +++ b/examples/MQ/5-req-rep/testMQEx5.sh.in @@ -15,6 +15,7 @@ CLIENT_PID=$! SERVER="ex5-server" SERVER+=" --id server" +SERVER+=" --verbosity NOLOG" SERVER+=" --control static --log-color false" SERVER+=" --max-iterations 1" SERVER+=" --mq-config $ex5config" diff --git a/examples/MQ/6-multiple-channels/testMQEx6.sh.in b/examples/MQ/6-multiple-channels/testMQEx6.sh.in index 94969685..591632c7 100755 --- a/examples/MQ/6-multiple-channels/testMQEx6.sh.in +++ b/examples/MQ/6-multiple-channels/testMQEx6.sh.in @@ -17,6 +17,7 @@ sleep 1 SAMPLER="ex6-sampler" SAMPLER+=" --id sampler1" +SAMPLER+=" --verbosity NOLOG" SAMPLER+=" --max-iterations 1" SAMPLER+=" --control static --log-color false" SAMPLER+=" --mq-config $ex6config" @@ -25,6 +26,7 @@ SAMPLER_PID=$! BROADCASTER="ex6-broadcaster" BROADCASTER+=" --id broadcaster1" +BROADCASTER+=" --verbosity NOLOG" BROADCASTER+=" --control static --log-color false" BROADCASTER+=" --mq-config $ex6config" @CMAKE_BINARY_DIR@/bin/examples/MQ/6-multiple-channels/$BROADCASTER & diff --git a/examples/MQ/8-multipart/testMQEx8.sh.in b/examples/MQ/8-multipart/testMQEx8.sh.in index 3147c4d0..a8f204b8 100755 --- a/examples/MQ/8-multipart/testMQEx8.sh.in +++ b/examples/MQ/8-multipart/testMQEx8.sh.in @@ -6,6 +6,7 @@ trap 'kill -TERM $SAMPLER_PID; kill -TERM $SINK_PID; wait $SAMPLER_PID; wait $SI SAMPLER="ex8-sampler" SAMPLER+=" --id sampler1" +SAMPLER+=" --verbosity NOLOG" SAMPLER+=" --max-iterations 1" SAMPLER+=" --control static --log-color false" SAMPLER+=" --mq-config $ex8config" diff --git a/examples/MQ/multiple-transports/testMTEx.sh.in b/examples/MQ/multiple-transports/testMTEx.sh.in index 66a6595b..cc7669ce 100755 --- a/examples/MQ/multiple-transports/testMTEx.sh.in +++ b/examples/MQ/multiple-transports/testMTEx.sh.in @@ -17,6 +17,7 @@ SINK_PID=$! SAMPLER1="ex-mt-sampler1" SAMPLER1+=" --id sampler1" SAMPLER1+=" --session $SESSION" +SAMPLER1+=" --verbosity NOLOG" SAMPLER1+=" --max-iterations 1" SAMPLER1+=" --control static --log-color false" SAMPLER1+=" --transport shmem" @@ -27,6 +28,7 @@ SAMPLER1_PID=$! SAMPLER2="ex-mt-sampler2" SAMPLER2+=" --id sampler2" SAMPLER2+=" --session $SESSION" +SAMPLER2+=" --verbosity NOLOG" SAMPLER2+=" --max-iterations 1" SAMPLER2+=" --control static --log-color false" SAMPLER2+=" --transport nanomsg"