[PATCH] KVM: selftests: Reword the NX hugepage test's skip message to be more helpful

[PATCH] KVM: selftests: Reword the NX hugepage test's skip message to be more helpful

[Sean Christopherson]

Rework the NX hugepage test's skip message regarding the magic token to
provide all of the necessary magic, and to very explicitly recommended
using the wrapper shell script.

Opportunistically remove an overzealous newline; splitting the
recommendation message across two lines of ~45 characters makes it much
harder to read than running out a single line to 98 characters.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c b/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c
index 83e25bccc139..17bbb96fc4df 100644
--- a/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c
+++ b/tools/testing/selftests/kvm/x86_64/nx_huge_pages_test.c
@@ -257,9 +257,9 @@ int main(int argc, char **argv)
 	TEST_REQUIRE(kvm_has_cap(KVM_CAP_VM_DISABLE_NX_HUGE_PAGES));
 
 	__TEST_REQUIRE(token == MAGIC_TOKEN,
-		       "This test must be run with the magic token %d.\n"
-		       "This is done by nx_huge_pages_test.sh, which\n"
-		       "also handles environment setup for the test.", MAGIC_TOKEN);
+		       "This test must be run with the magic token via '-t %d'.\n"
+		       "Running via nx_huge_pages_test.sh, which also handles "
+		       "environment setup, is strongly recommended.", MAGIC_TOKEN);
 
 	run_test(reclaim_period_ms, false, reboot_permissions);
 	run_test(reclaim_period_ms, true, reboot_permissions);

base-commit: 6803fb00772cc50cd59a66bd8caaee5c84b13fcf
-- 
2.43.0.rc1.413.gea7ed67945-goog

Re: [PATCH] KVM: selftests: Reword the NX hugepage test's skip message to be more helpful

[Sean Christopherson]

On Wed, 29 Nov 2023 14:40:41 -0800, Sean Christopherson wrote:
> Rework the NX hugepage test's skip message regarding the magic token to
> provide all of the necessary magic, and to very explicitly recommended
> using the wrapper shell script.
> 
> Opportunistically remove an overzealous newline; splitting the
> recommendation message across two lines of ~45 characters makes it much
> harder to read than running out a single line to 98 characters.
> 
> [...]

Applied to kvm-x86 selftests, thanks!

[1/1] KVM: selftests: Reword the NX hugepage test's skip message to be more helpful
      https://github.com/kvm-x86/linux/commit/02add85a9eef

--
https://github.com/kvm-x86/linux/tree/next