| Message ID | 699e4e1382e005386722bc296602d1b270a28b1e.1643393473.git.reinette.chatre@intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5626de65f97ae152e6dafdc528a36c1cbb7146ee |
| Headers | show |
| Series | selftests/sgx: Early enclave loading error path fixes | expand |
On 1/28/22 10:23, Reinette Chatre wrote: > The TH_LOG() macro is an optional debug logging function made > available by kselftest itself. When TH_LOG_ENABLED is set it > prints the provided message with additional information and > formatting that already includes a newline. > > Providing a newline to the message printed by TH_LOG() results > in a double newline that produces irregular test output. > > Remove the unnecessary newlines from the text provided to > TH_LOG(). Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
On Fri, Jan 28, 2022 at 10:23:59AM -0800, Reinette Chatre wrote: > The TH_LOG() macro is an optional debug logging function made > available by kselftest itself. When TH_LOG_ENABLED is set it > prints the provided message with additional information and > formatting that already includes a newline. > > Providing a newline to the message printed by TH_LOG() results > in a double newline that produces irregular test output. > > Remove the unnecessary newlines from the text provided to > TH_LOG(). > > Fixes: 1b35eb719549 ("selftests/sgx: Encpsulate the test enclave creation") > Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> > --- > tools/testing/selftests/sgx/main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c > index b0bd95a4730d..dd74fa42302e 100644 > --- a/tools/testing/selftests/sgx/main.c > +++ b/tools/testing/selftests/sgx/main.c > @@ -146,7 +146,7 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl, > > if (!encl_load("test_encl.elf", encl, heap_size)) { > encl_delete(encl); > - TH_LOG("Failed to load the test enclave.\n"); > + TH_LOG("Failed to load the test enclave."); > return false; > } > > @@ -204,7 +204,7 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl, > fclose(maps_file); > } > > - TH_LOG("Failed to initialize the test enclave.\n"); > + TH_LOG("Failed to initialize the test enclave."); > > encl_delete(encl); > > -- > 2.25.1 > Sorry for the super slow latency. The reason has been job transition, and also getting SGX remote attestation to work with a non-Intel stack. Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> /Jarkko
diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c index b0bd95a4730d..dd74fa42302e 100644 --- a/tools/testing/selftests/sgx/main.c +++ b/tools/testing/selftests/sgx/main.c @@ -146,7 +146,7 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl, if (!encl_load("test_encl.elf", encl, heap_size)) { encl_delete(encl); - TH_LOG("Failed to load the test enclave.\n"); + TH_LOG("Failed to load the test enclave."); return false; } @@ -204,7 +204,7 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl, fclose(maps_file); } - TH_LOG("Failed to initialize the test enclave.\n"); + TH_LOG("Failed to initialize the test enclave."); encl_delete(encl);
The TH_LOG() macro is an optional debug logging function made available by kselftest itself. When TH_LOG_ENABLED is set it prints the provided message with additional information and formatting that already includes a newline. Providing a newline to the message printed by TH_LOG() results in a double newline that produces irregular test output. Remove the unnecessary newlines from the text provided to TH_LOG(). Fixes: 1b35eb719549 ("selftests/sgx: Encpsulate the test enclave creation") Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> --- tools/testing/selftests/sgx/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)