Skip to content

Commit 5f74cb1

Browse files
authored
Merge pull request #7 from bandi13/fixLogfile
Append everything to LOG_FILE
2 parents ae8f4e5 + 5635f2e commit 5f74cb1

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

scripts/test-openssl.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,12 +296,6 @@ if [ $? != 0 ]; then
296296
do_cleanup
297297
exit 1
298298
fi
299-
make install &>> $LOG_FILE
300-
if [ $? != 0 ]; then
301-
tail -n 20 $LOG_FILE
302-
do_cleanup
303-
exit 1
304-
fi
305299

306300
# Start with returning success
307301
FAIL_CNT=0

scripts/test-wp-cs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ prepend() { # Usage: cmd 2>&1 | prepend "sometext "
3434

3535
kill_servers() {
3636
if [ $(check_process_running $OPENSSL_SERVER_PID) = "0" ]; then
37-
(kill -9 $OPENSSL_SERVER_PID) >/dev/null 2>&1
37+
(kill -9 $OPENSSL_SERVER_PID) &>/dev/null
3838
fi
3939
}
4040

@@ -149,7 +149,7 @@ start_openssl_server() { # usage: start_openssl_server [extraArgs]
149149
-cert $CERT_DIR/server-cert.pem -key $CERT_DIR/server-key.pem \
150150
-dcert $CERT_DIR/server-ecc.pem -dkey $CERT_DIR/ecc-key.pem \
151151
-accept $OPENSSL_PORT $OPENSSL_ALL_CIPHERS \
152-
2>&1 | prepend "[server] " >>$LOG_FILE &
152+
2>&1 | prepend "[server] " &>>$LOG_FILE &
153153
OPENSSL_SERVER_PID=$(($! - 1))
154154

155155
sleep 0.1
@@ -170,15 +170,15 @@ do_client() { # usage: do_client [extraArgs]
170170
-cipher $CIPHER $TLS_VERSION \
171171
-connect localhost:$OPENSSL_PORT \
172172
-curves $CURVES \
173-
2>&1 | prepend "[client] " >>$LOG_FILE
173+
2>&1 | prepend "[client] " &>>$LOG_FILE
174174
)
175175
else
176176
(echo -n | \
177177
stdbuf -oL -eL $OPENSSL_BIN s_client $1 \
178178
-ciphersuites $CIPHER $TLS_VERSION \
179179
-connect localhost:$OPENSSL_PORT \
180180
-curves $CURVES \
181-
2>&1 | prepend "[client] " >>$LOG_FILE
181+
2>&1 | prepend "[client] " &>>$LOG_FILE
182182
)
183183
fi
184184
if [ "$?" = "0" ]; then

0 commit comments

Comments
 (0)