apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

src/locktest: Audit all debug output

Browse Source 
Audit all the debug output to be clear on what failed so that we can
remove the debug flag from the script.

Specifically, remove the need for a debug flag on system call error
output.  This helps to indicate what happened when an individual test
step fails.

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Ira Weiny
2019-09-23 10:53:30 -07:00
committed by Eryu Guan
parent 170771f3c8
commit 4d0f2152e5
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/locktest.c
+11 -8
View File
@@ -647,7 +647,7 @@ static int do_lock(int cmd, int type, int start, int length)
ret = fcntl(filedes, cmd, &fl); ret = fcntl(filedes, cmd, &fl);
saved_errno = errno; saved_errno = errno;
if(debug > 1 && ret) if(ret)
fprintf(stderr, "do_lock: ret = %d, errno = %d (%s)\n", ret, errno, strerror(errno)); fprintf(stderr, "do_lock: ret = %d, errno = %d (%s)\n", ret, errno, strerror(errno));
return(ret==0?PASS:FAIL); return(ret==0?PASS:FAIL);
@@ -665,8 +665,11 @@ int do_close(void)
saved_errno = errno; saved_errno = errno;
if (errno) if (errno) {
fprintf(stderr, "%s errno = %d (%s)\n",
__FILE__, errno, strerror(errno));
return FAIL; return FAIL;
}
return PASS; return PASS;
} }
@@ -686,7 +689,7 @@ send_ctl(void)
{ {
int nwrite; int nwrite;
if (debug > 1) { if (debug) {
fprintf(stderr, "send_ctl: test=%d, command=%d offset=%"LL"d, length=%"LL"d, result=%d, error=%d\n", fprintf(stderr, "send_ctl: test=%d, command=%d offset=%"LL"d, length=%"LL"d, result=%d, error=%d\n",
ctl.test, ctl.command, (long long)ctl.offset, (long long)ctl.length,ctl.result, ctl.error); ctl.test, ctl.command, (long long)ctl.offset, (long long)ctl.length,ctl.result, ctl.error);
} }
@@ -741,7 +744,7 @@ void recv_ctl(void)
ctl.index= bswap_uint32(ctl.index); ctl.index= bswap_uint32(ctl.index);
ctl.error= bswap_uint32(ctl.error); ctl.error= bswap_uint32(ctl.error);
if (debug > 1) { if (debug) {
fprintf(stderr, "recv_ctl: test=%d, command=%d offset=%"LL"d, length=%"LL"d, result=%d, error=%d\n", fprintf(stderr, "recv_ctl: test=%d, command=%d offset=%"LL"d, length=%"LL"d, result=%d, error=%d\n",
ctl.test, ctl.command, (long long)ctl.offset, (long long)ctl.length, ctl.result, ctl.error); ctl.test, ctl.command, (long long)ctl.offset, (long long)ctl.length, ctl.result, ctl.error);
} }
@@ -977,7 +980,7 @@ main(int argc, char *argv[])
} }
/* If we have a server command, deal with it */ /* If we have a server command, deal with it */
if(tests[index][WHO] == SERVER) { if(tests[index][WHO] == SERVER) {
if(debug>1) if(debug)
fprintf(stderr, "Got a server command (%d)\n", index); fprintf(stderr, "Got a server command (%d)\n", index);
if(tests[index][TEST_NUM] == 0) { if(tests[index][TEST_NUM] == 0) {
index++; index++;
@@ -1031,7 +1034,7 @@ main(int argc, char *argv[])
} }
/* get the client to do something */ /* get the client to do something */
init_ctl(index); init_ctl(index);
if(debug > 1) if(debug)
fprintf(stderr, "Sending command to client (%d) - %s - %lld:%lld\n", fprintf(stderr, "Sending command to client (%d) - %s - %lld:%lld\n",
index, index,
get_cmd_str(ctl.command), get_cmd_str(ctl.command),
@@ -1068,7 +1071,7 @@ main(int argc, char *argv[])
index++; index++;
} else { /* CLIENT */ } else { /* CLIENT */
if(debug > 2) if(debug)
fprintf(stderr,"client: waiting...\n"); fprintf(stderr,"client: waiting...\n");
/* wait for the server to do something */ /* wait for the server to do something */
recv_ctl(); recv_ctl();
@@ -1120,7 +1123,7 @@ main(int argc, char *argv[])
ctl.result = PASS; ctl.result = PASS;
ctl.error = 0; ctl.error = 0;
} }
if(debug > 2) if(debug)
fprintf(stderr,"client: sending result to server (%d)\n", ctl.index); fprintf(stderr,"client: sending result to server (%d)\n", ctl.index);
/* Send result to the server */ /* Send result to the server */
send_ctl(); send_ctl();
tests/generic/131
+2 -3
View File
@@ -14,7 +14,6 @@ here=`pwd`
tmp=/tmp/$$ tmp=/tmp/$$
status=1 # failure is the default! status=1 # failure is the default!
trap "_cleanup; exit \$status" 0 1 2 3 15 trap "_cleanup; exit \$status" 0 1 2 3 15
debug="-d"
TESTFILE=$TEST_DIR/lock_file TESTFILE=$TEST_DIR/lock_file
@@ -63,7 +62,7 @@ function dump_logs_fail()
} }
# Start the server # Start the server
src/locktest $debug $TESTFILE 2> $SERVER_LOG 1> $SERVER_PORT & src/locktest $TESTFILE 2> $SERVER_LOG 1> $SERVER_PORT &
server_pid=$! server_pid=$!
timeout=30 timeout=30
@@ -89,7 +88,7 @@ fi
# Start the client # Start the client
src/locktest $debug -p $PORT -h localhost $TESTFILE 2> $CLIENT_LOG src/locktest -p $PORT -h localhost $TESTFILE 2> $CLIENT_LOG
client_result=$? client_result=$?
client_pid=$! client_pid=$!
if [ $client_result -ne 0 ]; then if [ $client_result -ne 0 ]; then