From 5ad1c0e821a5aaafe47dbe79d5f69820fde798bd Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Fri, 7 Mar 2025 09:09:45 +0100 Subject: Implement JSON output parsing for tests --- NPTest.pm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'NPTest.pm') diff --git a/NPTest.pm b/NPTest.pm index 9b25ac3e..47773acc 100644 --- a/NPTest.pm +++ b/NPTest.pm @@ -15,6 +15,8 @@ use warnings; use Cwd; use File::Basename; +use JSON; + use IO::File; use Data::Dumper; @@ -617,6 +619,8 @@ sub testCmd { chomp $output; $object->output($output); + $object->{'mp_test_result'} = decode_json($output); + alarm(0); my ($pkg, $file, $line) = caller(0); -- cgit v1.2.3-74-g34f1 From 18dedf3463534a9f6c8137628c482298dbb0459b Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:28:36 +0100 Subject: Do not die in tests if JSON Parsing fails --- NPTest.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'NPTest.pm') diff --git a/NPTest.pm b/NPTest.pm index 47773acc..f9f18b5f 100644 --- a/NPTest.pm +++ b/NPTest.pm @@ -17,6 +17,8 @@ use File::Basename; use JSON; +use feature 'try'; + use IO::File; use Data::Dumper; @@ -619,7 +621,9 @@ sub testCmd { chomp $output; $object->output($output); - $object->{'mp_test_result'} = decode_json($output); + try { + $object->{'mp_test_result'} = decode_json($output); + } alarm(0); -- cgit v1.2.3-74-g34f1 From f2275431783a5aaed25c35b5deec37c244872a7a Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Fri, 7 Mar 2025 17:48:27 +0100 Subject: Use Try::Tiny instead of experimental feature --- NPTest.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'NPTest.pm') diff --git a/NPTest.pm b/NPTest.pm index f9f18b5f..987d3b71 100644 --- a/NPTest.pm +++ b/NPTest.pm @@ -17,7 +17,7 @@ use File::Basename; use JSON; -use feature 'try'; +use Try::Tiny; use IO::File; use Data::Dumper; @@ -623,7 +623,7 @@ sub testCmd { try { $object->{'mp_test_result'} = decode_json($output); - } + }; alarm(0); -- cgit v1.2.3-74-g34f1 From ff8aa20d0e42ca20184f67ec035d157c70ae7605 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Fri, 7 Mar 2025 19:29:24 +0100 Subject: Just use eval instead of Try::Tiny in tests --- NPTest.pm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'NPTest.pm') diff --git a/NPTest.pm b/NPTest.pm index 987d3b71..1c008589 100644 --- a/NPTest.pm +++ b/NPTest.pm @@ -17,8 +17,6 @@ use File::Basename; use JSON; -use Try::Tiny; - use IO::File; use Data::Dumper; @@ -621,9 +619,7 @@ sub testCmd { chomp $output; $object->output($output); - try { - $object->{'mp_test_result'} = decode_json($output); - }; + eval { $object->{'mp_test_result'} = decode_json($output) }; alarm(0); -- cgit v1.2.3-74-g34f1