From a69bd367f3db3304618e29752ac221dfd09a5434 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Tue, 27 Jul 2021 16:13:17 +0200
Subject: [PATCH] Simplify the postprocessing of cling/array/array1test - not
 enough to get rid of it.

---
 cling/array/array1.C              | 12 ++++++------
 cling/array/array1test.ref        |  8 ++++----
 cling/array/array1test_convert.sh |  4 +---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/cling/array/array1.C b/cling/array/array1.C
index ec706c1336..2ca8ecf45c 100644
--- a/cling/array/array1.C
+++ b/cling/array/array1.C
@@ -2,17 +2,17 @@
 typedef unsigned long l_size_t; const int n1 = 1;
 TString a1[n1];
 #ifdef ClingWorkAroundPrintfIssues
-fprintf(stderr,"a1 is 0x%lx 0x%lx\n",(l_size_t)a1,(l_size_t)&(a1[0]));
+fprintf(stderr,"a1 is %s %s\n",((l_size_t)a1) ? "not_null" : "null",((l_size_t)&(a1[0])) ? "not_null" : "null");
 #else
-fprintf(stdout,"a1 is 0x%lx 0x%lx\n",(l_size_t)a1,(l_size_t)&(a1[0]));
+fprintf(stdout,"a1 is %s %s\n",((l_size_t)a1) ? "not_null" : "null",((l_size_t)&(a1[0])) ? "not_null" : "null");
 #endif
 const int n2 = 2;
-TString a2[n2];   
+TString a2[n2];
 #ifdef ClingWorkAroundPrintfIssues
-fprintf(stderr,"a2 is 0x%lx 0x%lx\n",(l_size_t)a2,(l_size_t)&(a2[0]));
+fprintf(stderr,"a2 is %s %s\n",((l_size_t)a2) ? "not_null" : "null",((l_size_t)&(a2[0])) ? "not_null" : "null");
 #else
-fprintf(stdout,"a2 is 0x%lx 0x%lx\n",(l_size_t)a2,(l_size_t)&(a2[0]));
+fprintf(stdout,"a2 is %s %s\n",((l_size_t)a2) ? "not_null" : "null",((l_size_t)&(a2[0])) ? "not_null" : "null");
 #endif
 gROOT->ProcessLine(".g a1");
 gROOT->ProcessLine(".g a2");
-} 
+}
diff --git a/cling/array/array1test.ref b/cling/array/array1test.ref
index 877d5e5dbc..41efaaa69e 100644
--- a/cling/array/array1test.ref
+++ b/cling/array/array1test.ref
@@ -1,6 +1,6 @@
 
 Processing runarray1test.C...
-a1 is  
-a2 is  
-array1.C          3   TString a1[1]=
-array1.C         10   TString a2[2]=
+a1 is not_null not_null
+a2 is not_null not_null
+array1.C          4 (address: NA) class TString a1[1], size =
+array1.C         11 (address: NA) class TString a2[2], size =
diff --git a/cling/array/array1test_convert.sh b/cling/array/array1test_convert.sh
index c2acc340a3..241d279e19 100755
--- a/cling/array/array1test_convert.sh
+++ b/cling/array/array1test_convert.sh
@@ -1,3 +1 @@
-sed -e 's/0x[^ ]*//g' -e 's/[A-Za-z]:.*array1.C/array1.C/g' \
-	-e 's/(address: NA) class/ /' -e 's/, size = .*/=/' \
-	-e 's/input_line_[0-9]*/array1.C/' -e 's/    4   /         3   /' -e 's/   11   /         10   /'
+sed -e 's/, size = .*/, size =/' \