Merge changes from 3.15 branch into 3.16

src/ca/client/tools/tool_lib.c

@@ -79,14 +79,14 @@ static void sprint_long (char *ret, dbr_long_t val, IntFormatT outType)
     }
     else {
         const char *fmt[4] = { /* Order must match the enum IntFormatT */
-            "%ld"   /* dec */,
-            "0"     /* bin, val is 0 */,
-            "0o%lo" /* oct */,
-            "0x%lX" /* hex */
+            "%d"   /* dec */,
+            "0"    /* bin and val is 0 */,
+            "0o%o" /* oct */,
+            "0x%X" /* hex */
         };
 
-        /* Formats have long modifier, pass value as a long */
-        sprintf(ret, fmt[outType], (long) val);
+        /* dbr_long_t is actually an int on all supported platforms */
+        sprintf(ret, fmt[outType], (int) val);
     }
 }
 

src/ioc/as/Makefile

@@ -23,4 +23,4 @@ dbCore_SRCS += asIocRegister.c
 
 PROD_HOST += ascheck
 ascheck_SRCS = ascheck.c
-ascheck_LIBS = dbCore ca
+ascheck_LIBS = dbCore ca Com

src/ioc/dbtemplate/test/Makefile

@@ -11,7 +11,7 @@ include $(TOP)/configure/CONFIG
 TESTPROD_HOST_DEFAULT = dbltExpand
 TESTPROD_HOST_WIN32 = -nil-
 dbltExpand_SRCS += dbltExpand.c
-dbltExpand_LIBS += dbCore Com
+dbltExpand_LIBS += dbCore ca Com
 
 TESTS += msi
 

src/std/filters/test/Makefile

@@ -14,7 +14,7 @@ TESTLIBRARY = Recs
 
 Recs_SRCS += xRecord.c
 Recs_SRCS += arrRecord.c
-Recs_LIBS += dbCore Com
+Recs_LIBS += dbCore ca Com
 
 PROD_LIBS = Recs dbRecStd dbCore ca Com
 

src/tools/makeTestfile.pl

@@ -23,10 +23,6 @@ use strict;
 
 my ($target, $exe) = @ARGV;
 
-# Use system on Windows, exec doesn't work the same there and
-# GNUmake thinks the test has finished as soon as Perl exits.
-my $exec = $^O eq 'MSWin32' ? "system('./$exe') == 0" : "exec './$exe'";
-
 open(my $OUT, '>', $target) or die "Can't create $target: $!\n";
 
 print $OUT <<EOF;
@@ -37,7 +33,15 @@ use Cwd 'abs_path';
 
 \$ENV{HARNESS_ACTIVE} = 1 if scalar \@ARGV && shift eq '-tap';
 \$ENV{TOP} = abs_path(\$ENV{TOP}) if exists \$ENV{TOP};
-$exec or die "Can't run $exe: \$!\\n";
+
+if (\$^O eq 'MSWin32') {
+    # Use system on Windows, exec doesn't work the same there and
+    # GNUmake thinks the test has finished as soon as Perl exits.
+    system('./$exe') == 0 or die "Can't run $exe: \$!\\n";
+}
+else {
+    exec './$exe' or die "Can't run $exe: \$!\\n";
+}
 EOF
 
 close $OUT or die "Can't close $target: $!\n";