Fix compilation problems in C tests

The tests that are C source files are not compiling.  Fix those
errors, including:

- augmenting test_incflags in runtest.sh
  (and improving readability while we are at it)

- remove xfail for some tests

- update names of dtrace_syminfo_t members

Signed-off-by: Eugene Loh <eugene.loh@oracle.com>
Reviewed-by: Kris Van Hees <kris.van.hees@oracle.com>

runtest.sh

@@ -8,7 +8,7 @@
 #               and generated intermediate representation.
 #
 # Oracle Linux DTrace.
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # http://oss.oracle.com/licenses/upl.
 
@@ -522,7 +522,7 @@ if [[ -z $USE_INSTALLED ]]; then
     dtrace="$(pwd)/build*/dtrace"
     test_libdir="$(pwd)/build/dlibs"
     test_ldflags="-L$(pwd)/build"
-    test_incflags="-Iuts/common -DARCH_$arch"
+    test_incflags="-Iinclude -Iuts/common -Ibuild -Ilibdtrace -DARCH_$arch"
 
     if [[ -z $(eval echo $dtrace) ]]; then
     	echo "No dtraces available." >&2
@@ -1139,8 +1139,11 @@ for dt in $dtrace; do
             fi
 
             CC="${CC:-gcc}"
-            log "Compiling $CC -std=gnu99 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $test_incflags $CFLAGS $test_ldflags $LDFLAGS -o $tmpdir/$base $_test $link\n"
-            if ! $CC $CFLAGS -std=gnu99 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $test_incflags $test_ldflags $LDFLAGS -o $tmpdir/$(basename $base) $_test $link >/dev/null 2>$tmpdir/cc.err; then
+            CCline="$CC -std=gnu99 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+            CCline="$CCline $test_incflags $CFLAGS $test_ldflags $LDFLAGS"
+            CCline="$CCline -o $tmpdir/$(basename $base) $_test $link"
+            log "Compiling $CCline\n"
+            if ! $CCline >/dev/null 2>$tmpdir/cc.err; then
                 fail=t
                 failmsg="compilation failure"
                 fail "$xfail" "$xfailmsg" "compilation failure"

test/unittest/consumer/addr2str-null.c

@@ -1,10 +1,9 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
-/* @@xfail: dtv2 */
 
 /*
  * Verify that a dtrace_addr2str() of the null pointer does not

test/unittest/consumer/tst.merge_ranges_bug25767469.c

@@ -1,10 +1,9 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
-/* @@xfail: dtv2 */
 
 /*
  * 25767469 dtrace_update() does not merge address ranges properly

test/unittest/consumer/tst.symbols.c

@@ -1,6 +1,6 @@
 /*
  * Oracle Linux DTrace.
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * http://oss.oracle.com/licenses/upl.
  */
@@ -195,8 +195,8 @@ void match_at_addr(int i, GElf_Sym *symp, dtrace_syminfo_t *sip) {
 		printf("  actual: %16.16llx %8.8llx %32s %20s\n",
 		    (long long)symp->st_value,
 		    (long long)symp->st_size,
-		    sip->dts_name,
-		    sip->dts_object);
+		    sip->name,
+		    sip->object);
 	}
 
 	/*
@@ -205,19 +205,19 @@ void match_at_addr(int i, GElf_Sym *symp, dtrace_syminfo_t *sip) {
 	 * some known symbol at this address.
 	 */
 
-	if (strcmp(symbols[i].symname, sip->dts_name) == 0)
+	if (strcmp(symbols[i].symname, sip->name) == 0)
 		match = i;
 
 	j = i - 1;
 	while (match < 0 && j >= 0 && symbols[j].addr == symbols[i].addr) {
-		if (strcmp(symbols[j].symname, sip->dts_name) == 0)
+		if (strcmp(symbols[j].symname, sip->name) == 0)
 			match = j;
 		j--;
 	}
 
 	j = i + 1;
 	while (match < 0 && j < nsymbols && symbols[j].addr == symbols[i].addr) {
-		if (strcmp(symbols[j].symname, sip->dts_name) == 0)
+		if (strcmp(symbols[j].symname, sip->name) == 0)
 			match = j;
 		j++;
 	}
@@ -229,16 +229,16 @@ void match_at_addr(int i, GElf_Sym *symp, dtrace_syminfo_t *sip) {
 
 	if (match < 0 ||
 	    symbols[match].size != symp->st_size ||
-	    strcmp(symbols[match].modname, sip->dts_object)) {
+	    strcmp(symbols[match].modname, sip->object)) {
 		nerrors++;
 		printf("ERROR: no such reported symbol\n");
 		printf("  expect:");
 		print_symbol(i);
 		printf("  actual: %16.16llx %8.8llx %32s %20s\n",
 		    (long long)symp->st_value,
 		    (long long)symp->st_size,
-		    sip->dts_name,
-		    sip->dts_object);
+		    sip->name,
+		    sip->object);
 	}
 }
 
@@ -305,17 +305,17 @@ int check_lookup_by_name(dtrace_hdl_t *h, int specify_module) {
 
 			if (symbols[i].addr != sym.st_value ||
 			    symbols[i].size != sym.st_size ||
-			    strcmp(symbols[i].symname, si.dts_name) ||
-			    strcmp(symbols[i].modname, si.dts_object)) {
+			    strcmp(symbols[i].symname, si.name) ||
+			    strcmp(symbols[i].modname, si.object)) {
 
 				printf("ERROR: mismatch\n");
 				printf("  expect:");
 				print_symbol(i);
 				printf("  actual: %16.16llx %8.8llx %32s %20s\n",
 				    (long long)sym.st_value,
 				    (long long)sym.st_size,
-				    si.dts_name,
-				    si.dts_object);
+				    si.name,
+				    si.object);
 				nerrors++;
 			}
 		}