Commit 1f666e52 authored by Naresh Kamboju's avatar Naresh Kamboju Committed by Shuah Khan
Browse files

selftests: futex: print testcase-name and PASS/FAIL/ERROR status 



Most of the tests under selftests follow a pattern for their results,
which can then be parsed easily by other external tools easily. Though
futex tests do print the test results very well, it doesn't really
follow the general selftests pattern.

This patch makes necessary changes to fix that.

Output before this patch:
futex_requeue_pi: Test requeue functionality
        Arguments: broadcast=0 locked=0 owner=0 timeout=0ns
Result:  PASS

Output after this patch:
futex_requeue_pi: Test requeue functionality
        Arguments: broadcast=0 locked=0 owner=0 timeout=0ns
selftests: futex-requeue-pi [PASS]

Signed-off-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
parent 3c2993b8

tools/testing/selftests/futex/functional/futex_requeue_pi.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "futextest.h"

#include "logging.h"



#define TEST_NAME "futex-requeue-pi"

#define MAX_WAKE_ITERS 1000

#define THREAD_MAX 10

#define SIGNAL_PERIOD_US 100
@@ -404,6 +405,6 @@ int main(int argc, char *argv[]) 
	 */

	ret = unit_test(broadcast, locked, owner, timeout_ns);



	print_result(ret);

	print_result(TEST_NAME, ret);

	return ret;

}

tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include "futextest.h"

#include "logging.h"



#define TEST_NAME "futex-requeue-pi-mismatched-ops"



futex_t f1 = FUTEX_INITIALIZER;

futex_t f2 = FUTEX_INITIALIZER;

int child_ret = 0;
@@ -130,6 +132,6 @@ int main(int argc, char *argv[]) 


 out:

	/* If the kernel crashes, we shouldn't return at all. */

	print_result(ret);

	print_result(TEST_NAME, ret);

	return ret;

}

tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "futextest.h"

#include "logging.h"



#define TEST_NAME "futex-requeue-pi-signal-restart"

#define DELAY_US 100



futex_t f1 = FUTEX_INITIALIZER;
@@ -218,6 +219,6 @@ int main(int argc, char *argv[]) 
	if (ret == RET_PASS && waiter_ret)

		ret = waiter_ret;



	print_result(ret);

	print_result(TEST_NAME, ret);

	return ret;

}

tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "logging.h"

#include "futextest.h"



#define TEST_NAME "futex-wait-private-mapped-file"

#define PAGE_SZ 4096



char pad[PAGE_SZ] = {1};
@@ -60,7 +61,7 @@ void *thr_futex_wait(void *arg) 
	ret = futex_wait(&val, 1, &wait_timeout, 0);

	if (ret && errno != EWOULDBLOCK && errno != ETIMEDOUT) {

		error("futex error.\n", errno);

		print_result(RET_ERROR);

		print_result(TEST_NAME, RET_ERROR);

		exit(RET_ERROR);

	}
@@ -120,6 +121,6 @@ int main(int argc, char **argv) 
	pthread_join(thr, NULL);



 out:

	print_result(ret);

	print_result(TEST_NAME, ret);

	return ret;

}

tools/testing/selftests/futex/functional/futex_wait_timeout.c

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include "futextest.h"

#include "logging.h"



#define TEST_NAME "futex-wait-timeout"



static long timeout_ns = 100000;	/* 100us default timeout */



void usage(char *prog)
@@ -81,6 +83,6 @@ int main(int argc, char *argv[]) 
		ret = RET_FAIL;

	}



	print_result(ret);

	print_result(TEST_NAME, ret);

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE