From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-sgx@vger.kernel.org, Cedric Xing <cedric.xing@intel.com>,
Andy Lutomirski <luto@kernel.org>
Subject: [PATCH for_v2? v2 07/14] selftests/x86/sgx: Use standard helper function to signal pass/fail
Date: Wed, 16 Oct 2019 20:03:33 -0700 [thread overview]
Message-ID: <20191017030340.18301-8-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20191017030340.18301-1-sean.j.christopherson@intel.com>
Use the various helpers provided by kselftest.h to configure the test
and signal/pass failure.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
tools/testing/selftests/x86/sgx/main.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/tools/testing/selftests/x86/sgx/main.c b/tools/testing/selftests/x86/sgx/main.c
index 140dffe9c765..664a2ed98915 100644
--- a/tools/testing/selftests/x86/sgx/main.c
+++ b/tools/testing/selftests/x86/sgx/main.c
@@ -17,6 +17,8 @@
#include <sys/types.h>
#include <sys/auxv.h>
+#include "../../kselftest.h"
+
#include "defines.h"
#include "../../../../../arch/x86/kernel/cpu/sgx/arch.h"
#include "../../../../../arch/x86/include/uapi/asm/sgx.h"
@@ -336,15 +338,12 @@ static void test_sgx_basic(struct sgx_secs *secs)
{
uint64_t result = 0;
- printf("Input: 0x%lx\n", MAGIC);
-
sgx_call_eenter((void *)&MAGIC, &result, (void *)secs->base);
if (result != MAGIC) {
- fprintf(stderr, "0x%lx != 0x%lx\n", result, MAGIC);
- exit(1);
+ ksft_test_result_error("0x%lx != 0x%lx\n", result, MAGIC);
+ return;
}
-
- printf("Output: 0x%lx\n", result);
+ ksft_test_result_pass("%s: Passed\n", __func__);
}
static void test_sgx_vdso(struct sgx_secs *secs)
@@ -354,16 +353,13 @@ static void test_sgx_vdso(struct sgx_secs *secs)
memset(&exception, 0, sizeof(exception));
- printf("Input: 0x%lx\n", MAGIC);
-
sgx_call_vdso((void *)&MAGIC, &result, NULL, NULL, NULL, NULL,
(void *)secs->base, &exception, NULL);
if (result != MAGIC) {
- fprintf(stderr, "0x%lx != 0x%lx\n", result, MAGIC);
- exit(1);
+ ksft_test_result_error("0x%lx != 0x%lx\n", result, MAGIC);
+ return;
}
-
- printf("Output: 0x%lx\n", result);
+ ksft_test_result_pass("%s: Passed\n", __func__);
}
int main(int argc, char *argv[], char *envp[])
@@ -373,6 +369,9 @@ int main(int argc, char *argv[], char *envp[])
off_t bin_size;
void *bin;
+ ksft_print_header();
+ ksft_set_plan(2);
+
if (!encl_data_map("encl.bin", &bin, &bin_size))
exit(1);
@@ -389,5 +388,5 @@ int main(int argc, char *argv[], char *envp[])
test_sgx_vdso(&secs);
- exit(0);
+ return ksft_exit_pass();
}
--
2.22.0
next prev parent reply other threads:[~2019-10-17 3:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-17 3:03 [PATCH for_v2? v2 00/14] selftests/x86/sgx: Improve tests Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 01/14] selftests/x86/sgx: Fix a benign linker warning Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 02/14] selftests/x86/sgx: Use getauxval() to retrieve the vDSO base address Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 03/14] selftests/x86/sgx: Sanitize the types for sgx_vdso_call()'s input params Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 04/14] selftests/x86/sgx: Mark helper functions as static Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 05/14] selftests/x86/sgx: Move vDSO setup to a helper function Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 06/14] selftests/x86/sgx: Move individual tests into helper functions Sean Christopherson
2019-10-17 3:03 ` Sean Christopherson [this message]
2019-10-17 3:03 ` [PATCH for_v2? v2 08/14] selftests/harness: Move operator macros to their own header file Sean Christopherson
2019-10-17 16:53 ` Jarkko Sakkinen
2019-10-17 18:13 ` Sean Christopherson
2019-10-21 11:08 ` Jarkko Sakkinen
2019-10-22 3:20 ` Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 09/14] selftests/x86/sgx: Use kselftest operators to check test results Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 10/14] selftests/x86/sgx: Handle setup failures via kselftest assertions Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 11/14] selftests/x86/sgx: Add a check on the vDSO exception reporting mechanism Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 12/14] selftests/x86/sgx: Add test of vDSO with basic exit handler Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 13/14] selftests/x86/sgx: Add check to verify exit handler stack alignment Sean Christopherson
2019-10-17 3:03 ` [PATCH for_v2? v2 14/14] selftests/x86/sgx: Add test for exception behavior with exit handler Sean Christopherson
2019-10-18 10:12 ` [PATCH for_v2? v2 00/14] selftests/x86/sgx: Improve tests Jarkko Sakkinen
2019-10-18 10:20 ` Jarkko Sakkinen
2019-10-22 22:41 ` Sean Christopherson
2019-10-23 12:39 ` Jarkko Sakkinen
2019-10-26 14:08 ` Andy Lutomirski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191017030340.18301-8-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=cedric.xing@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-sgx@vger.kernel.org \
--cc=luto@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).