| Message ID | 16317683a1822bbd44ab3ca48b60a9a217ac24de.1643754040.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 2/1/22 3:47 PM, 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") > Acked-by: Dave Hansen <dave.hansen@linux.intel.com> > Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> > --- > Changes since V1: > - Add Acked-by from Dave. > > 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); > > Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
On Tue, Feb 01, 2022 at 02:47:06PM -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") > Acked-by: Dave Hansen <dave.hansen@linux.intel.com> > Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> > --- > Changes since V1: > - Add Acked-by from Dave. > > 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 > Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> BR, 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") Acked-by: Dave Hansen <dave.hansen@linux.intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> --- Changes since V1: - Add Acked-by from Dave. tools/testing/selftests/sgx/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)