Merged changes from 3.15 branch, revno 12629

configure/RULES_BUILD

@@ -299,7 +299,7 @@ $(LOADABLE_SHRLIBNAME): $(LOADABLE_SHRLIB_PREFIX)%$(LOADABLE_SHRLIB_SUFFIX):
 	@$(RM) $@
 	$(NM) $<  > $@
 
-%_ctdt.c: %.nm
+%_ctdt.c: %.nm $(TOOLS)/munch.pl
 	@$(RM) $@
 	$(PERL) $(TOOLS)/munch.pl -o $@ $<
 
@@ -325,7 +325,7 @@ tapfiles: $(TESTSCRIPTS) $(TAPFILES)
 
 # A .tap file is the output from running the associated test script
 %.tap: %.t
-	-HARNESS_ACTIVE=1 $(PERL) $< > $@
+	-$(PERL) $< -tap > $@
 
 # If there's a perl test script (.plt) available, use it
 %.t: ../%.plt
@@ -334,7 +334,7 @@ tapfiles: $(TESTSCRIPTS) $(TAPFILES)
 
 # Test programs (.t files) must be written in Perl.
 # Generate a perl program to exec the real test binary.
-%.t: %$(EXE)
+%.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
 	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
 

configure/os/CONFIG_SITE.Common.iosCommon

@@ -14,6 +14,7 @@
 #IOS_DEPLOYMENT_TARGET = 6.1
 IOS_DEPLOYMENT_TARGET = 7.0
 #IOS_DEPLOYMENT_TARGET = 8.0
+#IOS_DEPLOYMENT_TARGET = 8.1
 
 
 # Which compiler to use:

src/ca/legacy/gdd/gdd.cc

@@ -1353,7 +1353,7 @@ gddStatus gdd::put ( const gdd * dd )
         // clip to upper limit of source
         aitUint32 srcCopySize;
         const aitUint32 unusedSrcBelow = srcCopyFirst - srcFirst;
-        if ( srcElemCount <= unusedSrcBelow ) {
+        if ( srcElemCount && srcElemCount <= unusedSrcBelow ) {
             return gddErrorOutOfBounds;
         }
 

src/tools/makeTestfile.pl

@@ -12,6 +12,8 @@
 # because some versions of the Perl test harness can only run test scripts
 # that are actually written in Perl.  The script we generate execs the
 # real test program which must be in the same directory as the .t file.
+# If the script is given an argument -tap it sets HARNESS_ACTIVE in the
+# environment to make the epicsUnitTest code generate strict TAP output.
 
 # Usage: makeTestfile.pl target.t executable
 #     target.t is the name of the Perl script to generate
@@ -25,6 +27,7 @@ open(my $OUT, '>', $target) or die "Can't create $target: $!\n";
 
 print $OUT <<EOF;
 #!/usr/bin/perl
+\$ENV{HARNESS_ACTIVE} = 1 if scalar \@ARGV && shift eq '-tap';
 exec './$exe' or die 'exec failed';
 EOF