Merge lp:~epics-core/epics-base/test-rtems-w-qemu into lp:~epics-core/epics-base/3.16

[mdavidsaver]

Enable easy execution of RTEMS-pc386 test harnesses with QEMU (and windows on *nix w/ WINE).

Avoid the usual problem of NIC support (and the rtems 4.10 tftp bug) by including test data file in the test executables. Test files are encoded as C source using a script. Files are extracted into memory on boot.

For RTEMS build both the combined test harness and individual test executables.

Teach makeTestfile.pl to generate .t files which call qemu or wine based on T_A and EPICS_HOST_ARCH.

Includes some additions to rtems_init.c to allow conditional bypass of NFS mounting.

[mdavidsaver (mdavidsaver)]

I don't consider this a priority for 3.16.0.1. I'm publishing this now because it's handy to be able to 'make runtests' for rtems and windows cross targets.

[lp:~epics-core/epics-base/test-rtems-w-qemu]

12719. By mdavidsaver on 2016-03-01

db/test: dbStressLock skip for RTEMS

This test assumes that several threads with
equal priority will all run eventually.
This isn't turn an UP target without
time sliced scheduling.

12720. By mdavidsaver on 2016-03-01

rec/test: rtems build self contained tests and run individually

12721. By mdavidsaver on 2016-03-01

rec/test: add missing TESTFILES

12722. By mdavidsaver on 2016-03-01

rec/test: asTest fixup rtems test harness

Since this test has device support it must appear in a
DLL for windows dynamic builds.
However, the rRDD function is in the executable,
and not accessible here. So use iocsh.
For rtems/vxworks the test harness clears
iocsh registrations, so iocsh can't work here.

[Andrew Johnson (anj)]

Uses weak symbols -- issue with uC5282 BSP target, which is 68K family.

[Andrew Johnson (anj)]

Cancel that, the .o files for uC5282 are ELF.

[mdavidsaver (mdavidsaver)]

There is additional work on https://github.com/mdavidsaver/epics-base/tree/rtemstest which still needs to migrate to LP. I also need to see how this fits with work by Heinz on more recent rtems versions.

Unmerged revisions

12722. By mdavidsaver on 2016-03-01

rec/test: asTest fixup rtems test harness

Since this test has device support it must appear in a
DLL for windows dynamic builds.
However, the rRDD function is in the executable,
and not accessible here. So use iocsh.
For rtems/vxworks the test harness clears
iocsh registrations, so iocsh can't work here.

12721. By mdavidsaver on 2016-03-01

rec/test: add missing TESTFILES

12720. By mdavidsaver on 2016-03-01

rec/test: rtems build self contained tests and run individually

12719. By mdavidsaver on 2016-03-01

db/test: dbStressLock skip for RTEMS

This test assumes that several threads with
equal priority will all run eventually.
This isn't turn an UP target without
time sliced scheduling.

12718. By mdavidsaver on 2016-02-15

libCom/test: only run epicsUnitTest for host arch

custom .plt won't use WINE or QEMU when necessary.

12717. By mdavidsaver on 2016-02-15

build/run RTEMS-pc386 tests individually

Build and run individual test executable in addition
to the test harness.
Individual tests run with 'make runtests'.

omit epicsUnitTestTest as it has a custom .plt

12716. By mdavidsaver on 2016-02-15

RTEMS: build self contained test harness

Test data stub as a separate file to allow
linking into test harness and individual tests.

12715. By mdavidsaver on 2016-02-15

RTEMS: Add epicsMemFs and hook for app specific FS setup

Default falls back to network FS.

Compile in a set of files as a epicsMemFS structure.
epicsMemFsLoad() creates a set of files based on this.

12714. By mdavidsaver on 2016-02-15

src/tools: teach makeTestfile about WINE and QEMU

Teach makeTestfile host to run test for some cross built
targets.

12713. By mdavidsaver on 2016-02-15

libCom/misc: testMain for RTEMS give weak alias for main()

Allows tests to be linked separately or in a common test harness

=== modified file 'configure/RULES_BUILD'
--- configure/RULES_BUILD	2016-02-27 00:16:26 +0000
+++ configure/RULES_BUILD	2016-03-01 02:02:15 +0000
@@ -344,7 +344,7 @@
 # Generate a perl program to exec the real test binary.
 %.t: %$(EXE) $(TOOLS)/makeTestfile.pl
 	@$(RM) $@
-	$(PERL) $(TOOLS)/makeTestfile.pl $@ $<
+	$(PERL) $(TOOLS)/makeTestfile.pl "$(T_A)" $(EPICS_HOST_ARCH) $@ $<
 
 #---------------------------------------------------------------
 # Generate header with version number from VCS
 
=== modified file 'src/ioc/db/test/Makefile'
--- src/ioc/db/test/Makefile	2016-02-29 19:48:18 +0000
+++ src/ioc/db/test/Makefile	2016-03-01 02:02:15 +0000
@@ -157,6 +157,8 @@
 dbTestHarness_SRCS += $(testHarness_SRCS)
 dbTestHarness_SRCS_RTEMS += rtemsTestHarness.c
 
+PROD_SRCS_RTEMS += rtemsTestData.c
+
 PROD_vxWorks = dbTestHarness
 PROD_RTEMS = dbTestHarness
 
@@ -164,6 +166,10 @@
 TESTSPEC_RTEMS = dbTestHarness.boot; epicsRunDbTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
 
 include $(TOP)/configure/RULES
 
@@ -175,3 +181,5 @@
 scanIoTest$(DEP): $(COMMON_DIR)/xRecord.h
 xRecord$(DEP): $(COMMON_DIR)/xRecord.h
 
+rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl
+	$(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES)
 
=== modified file 'src/ioc/db/test/dbStressLock.c'
--- src/ioc/db/test/dbStressLock.c	2015-09-08 13:52:52 +0000
+++ src/ioc/db/test/dbStressLock.c	2016-03-01 02:02:15 +0000
@@ -230,6 +230,11 @@
 
     testPlan(80+nworkers*3);
 
+#if defined(__rtems__)
+    testSkip(80+nworkers*3, "Test assumes time sliced preempting scheduling");
+    return testDone();
+#endif
+
     priv = callocMustSucceed(nworkers, sizeof(*priv), "no memory");
 
     testDiag("lock set stress test");
 
=== modified file 'src/libCom/RTEMS/Makefile'
--- src/libCom/RTEMS/Makefile	2011-11-14 23:42:50 +0000
+++ src/libCom/RTEMS/Makefile	2016-03-01 02:02:15 +0000
@@ -10,6 +10,7 @@
 include $(TOP)/configure/CONFIG
 
 INC += epicsRtemsInitHooks.h
+INC += epicsMemFs.h
 
 rtemsCom_SRCS += rtems_init.c
 rtemsCom_SRCS += rtems_config.c
@@ -18,6 +19,7 @@
 rtemsCom_SRCS += setBootConfigFromNVRAM.c
 rtemsCom_SRCS += epicsRtemsInitHookPre.c
 rtemsCom_SRCS += epicsRtemsInitHookPost.c
+rtemsCom_SRCS += epicsMemFs.c
 
 LIBRARY_RTEMS = rtemsCom
 
 
=== added file 'src/libCom/RTEMS/epicsMemFs.c'
--- src/libCom/RTEMS/epicsMemFs.c	1970-01-01 00:00:00 +0000
+++ src/libCom/RTEMS/epicsMemFs.c	2016-03-01 02:02:15 +0000
@@ -0,0 +1,110 @@
+/*************************************************************************\
+* Copyright (c) 2014 Brookhaven National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
+#include "epicsMemFs.h"
+
+#ifndef PATH_MAX
+#  define PATH_MAX 100
+#endif
+
+int epicsMemFsLoad(const epicsMemFS *fs)
+{
+    char initdir[PATH_MAX];
+    const epicsMemFile * const *fileptr = fs->files;
+
+    if(getcwd(initdir, sizeof(initdir)-1)==NULL) {
+        perror("getcwd");
+        return errno;
+    }
+    initdir[sizeof(initdir)-1] = '\0';
+
+    for(;*fileptr; fileptr++) {
+        const epicsMemFile *curfile = *fileptr;
+        int fd;
+        ssize_t ret;
+        size_t sofar;
+        const char * const *dir = curfile->directory;
+        /* jump back to the root each time,
+         * slow but simple.
+         */
+        if(chdir(initdir)) {
+            perror("chdir");
+            return errno;
+        }
+
+        printf("-> /");
+
+        /* traverse directory tree, creating as necessary */
+        for(;*dir; dir++) {
+            int ret;
+            if(**dir=='.') continue; /* ignore '.' and '..' */
+            printf("%s/", *dir);
+            ret = chdir(*dir);
+            if(ret==-1 && errno==ENOENT) {
+                /* this directory doesn't exist */
+                if(mkdir(*dir,0744)==-1) {
+                    printf("\n");
+                    perror("mkdir");
+                    return errno;
+                }
+                if(chdir(*dir)==-1) {
+                    printf("\n");
+                    perror("chdir2");
+                    return errno;
+                }
+            } else if(ret==-1) {
+                printf("\n");
+                perror("chdir1");
+                return errno;
+            }
+        }
+
+        /* no file name creates an empty directory */
+        if(!curfile->name) {
+            printf("\n");
+            continue;
+        }
+        printf("%s", curfile->name);
+
+        /* create or overwrite */
+        fd = open(curfile->name, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+
+        if(fd==-1) {
+            printf("\n");
+            perror("open");
+            return errno;
+        }
+
+        sofar = 0;
+
+        while(sofar<curfile->size) {
+            ret = write(fd, curfile->data+sofar, curfile->size-sofar);
+            if(ret<=0) {
+                printf("\n");
+                perror("write");
+                return errno;
+            }
+            sofar += ret;
+        }
+
+        close(fd);
+        printf(" - ok\n");
+    }
+
+    if(chdir(initdir))
+        perror("chdir");
+
+    return 0;
+}
 
=== added file 'src/libCom/RTEMS/epicsMemFs.h'
--- src/libCom/RTEMS/epicsMemFs.h	1970-01-01 00:00:00 +0000
+++ src/libCom/RTEMS/epicsMemFs.h	2016-03-01 02:02:15 +0000
@@ -0,0 +1,24 @@
+/*************************************************************************\
+* Copyright (c) 2014 Brookhaven National Laboratory.
+* EPICS BASE is distributed subject to a Software License Agreement found
+* in file LICENSE that is included with this distribution.
+\*************************************************************************/
+#ifndef EPICSMEMFS_H
+#define EPICSMEMFS_H
+
+#include <stdlib.h>
+
+typedef struct {
+    const char * const *directory; /* NULL terminated list of directories */
+    const char *name; /* file name */
+    const char *data; /* file contents */
+    size_t size; /* size of file contents in bytes */
+} epicsMemFile;
+
+typedef struct {
+    const epicsMemFile * const *files;
+} epicsMemFS;
+
+int epicsMemFsLoad(const epicsMemFS *fs);
+
+#endif // EPICSMEMFS_H
 
=== modified file 'src/libCom/RTEMS/epicsRtemsInitHooks.h'
--- src/libCom/RTEMS/epicsRtemsInitHooks.h	2010-11-17 22:55:22 +0000
+++ src/libCom/RTEMS/epicsRtemsInitHooks.h	2016-03-01 02:02:15 +0000
@@ -22,3 +22,5 @@
  */
 int epicsRtemsInitPreSetBootConfigFromNVRAM(struct rtems_bsdnet_config *config);
 int epicsRtemsInitPostSetBootConfigFromNVRAM(struct rtems_bsdnet_config *config);
+/* Return 0 if local file system was setup, or non-zero (will fall back to network */
+int epicsRtemsMountLocalFilesystem(char **argv);
 
=== modified file 'src/libCom/RTEMS/rtems_init.c'
--- src/libCom/RTEMS/rtems_init.c	2016-02-15 17:29:22 +0000
+++ src/libCom/RTEMS/rtems_init.c	2016-03-01 02:02:15 +0000
@@ -43,6 +43,7 @@
 #include "osiUnistd.h"
 #include "iocsh.h"
 #include "osdTime.h"
+#include "epicsMemFs.h"
 
 #include "epicsRtemsInitHooks.h"
 
@@ -139,6 +140,31 @@
 # include <rtems/tftp.h>
 #endif
 
+const epicsMemFS *epicsRtemsFSImage __attribute__((weak));
+const epicsMemFS *epicsRtemsFSImage = (void*)&epicsRtemsFSImage;
+
+/* hook to allow app specific FS setup */
+int
+epicsRtemsMountLocalFilesystem(char **argv) __attribute__((weak));
+int
+epicsRtemsMountLocalFilesystem(char **argv)
+{
+    if(epicsRtemsFSImage==(void*)&epicsRtemsFSImage)
+        return -1; /* no FS image provided. */
+    else if(epicsRtemsFSImage==NULL)
+        return 0; /* no FS image provided, but none is needed. */
+    else {
+        printf("***** Using compiled in file data *****\n");
+        if (epicsMemFsLoad(epicsRtemsFSImage) != 0) {
+            printf("Can't unpack tar filesystem\n");
+            return -1;
+        } else {
+            argv[1] = "/";
+            return 0;
+        }
+    }
+}
+
 static int
 initialize_local_filesystem(char **argv)
 {
@@ -147,7 +173,9 @@
     extern char _FlashSize[]  __attribute__((weak));
 
     argv[0] = rtems_bsdnet_bootp_boot_file_name;
-    if (_FlashSize && (_DownloadLocation || _FlashBase)) {
+    if (epicsRtemsMountLocalFilesystem(argv)==0) {
+        return 1; /* FS setup successful */
+    } else if (_FlashSize && (_DownloadLocation || _FlashBase)) {
         extern char _edata[];
         size_t flashIndex = _edata - _DownloadLocation;
         char *header = _FlashBase + flashIndex;
@@ -591,6 +619,7 @@
     }
     printf("\n***** Initializing network *****\n");
     rtems_bsdnet_initialize_network();
+    printf("\n***** Setting up file system *****\n");
     initialize_remote_filesystem(argv, initialize_local_filesystem(argv));
     fixup_hosts();
 
 
=== modified file 'src/libCom/misc/testMain.h'
--- src/libCom/misc/testMain.h	2010-10-05 19:27:37 +0000
+++ src/libCom/misc/testMain.h	2016-03-01 02:02:15 +0000
@@ -28,7 +28,13 @@
  *     }
  */
 
-#if defined(vxWorks) || defined(__rtems__)
+#if defined(__rtems__)
+  #ifdef __cplusplus
+    #define MAIN(prog) extern "C" int prog(void); extern "C" int main() __attribute__((weak, alias(#prog))); extern "C" int prog(void)
+  #else
+    #define MAIN(prog) int prog(); int main() __attribute__((weak, alias(#prog))); int prog()
+  #endif
+#elif defined(vxWorks)
   #ifdef __cplusplus
     #define MAIN(prog) extern "C" int prog(void)
   #else
 
=== modified file 'src/libCom/test/Makefile'
--- src/libCom/test/Makefile	2016-02-25 20:13:40 +0000
+++ src/libCom/test/Makefile	2016-03-01 02:02:15 +0000
@@ -12,11 +12,18 @@
 
 PROD_LIBS += Com
 
+PROD_SRCS_RTEMS += rtemsTestData.c
+
+ifeq ($(EPICS_HOST_ARCH),$(T_A))
+# skip except for host arch due to custom .plt
+
 TESTPROD_HOST += epicsUnitTestTest
 epicsUnitTestTest_SRCS += epicsUnitTestTest.c
 # Not much point running this on vxWorks or RTEMS...
 TESTS += epicsUnitTestTest
 
+endif
+
 TESTPROD_HOST += epicsTypesTest
 epicsTypesTest_SRCS += epicsTypesTest.cpp
 testHarness_SRCS += epicsTypesTest.cpp
@@ -222,6 +229,10 @@
 TESTSPEC_RTEMS = libComTestHarness.boot; epicsRunLibComTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(filter-out epicsUnitTestTest.t, $(TESTS:%=%.t))
+endif
 
 
 # The following are not test programs, they measure performance.
 
=== added file 'src/libCom/test/rtemsTestData.c'
--- src/libCom/test/rtemsTestData.c	1970-01-01 00:00:00 +0000
+++ src/libCom/test/rtemsTestData.c	2016-03-01 02:02:15 +0000
@@ -0,0 +1,6 @@
+#include "epicsMemFs.h"
+
+/* no local files needed for these tests,
+ * so skip local FS setup
+ */
+const epicsMemFS *epicsRtemsFSImage = NULL;
 
=== modified file 'src/std/filters/test/Makefile'
--- src/std/filters/test/Makefile	2012-07-23 03:40:43 +0000
+++ src/std/filters/test/Makefile	2016-03-01 02:02:15 +0000
@@ -64,6 +64,8 @@
 filterTestHarness_SRCS += $(testHarness_SRCS)
 filterTestHarness_SRCS_RTEMS += rtemsTestHarness.c
 
+PROD_SRCS_RTEMS += rtemsTestData.c
+
 PROD_vxWorks = filterTestHarness
 PROD_RTEMS = filterTestHarness
 
@@ -71,6 +73,10 @@
 TESTSPEC_RTEMS = filterTestHarness.boot; epicsRunFilterTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
 
 include $(TOP)/configure/RULES
 
@@ -80,3 +86,6 @@
 syncTest$(DEP): $(COMMON_DIR)/xRecord.h
 arrRecord$(DEP): $(COMMON_DIR)/arrRecord.h
 arrTest$(DEP): $(COMMON_DIR)/arrRecord.h
+
+rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl
+	$(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES)
 
=== modified file 'src/std/rec/test/Makefile'
--- src/std/rec/test/Makefile	2016-03-01 01:37:25 +0000
+++ src/std/rec/test/Makefile	2016-03-01 02:02:15 +0000
@@ -71,6 +71,8 @@
 recordTestHarness_SRCS += $(testHarness_SRCS)
 recordTestHarness_SRCS_RTEMS += rtemsTestHarness.c
 
+PROD_SRCS_RTEMS += rtemsTestData.c
+
 PROD_vxWorks = recordTestHarness
 PROD_RTEMS = recordTestHarness
 
@@ -78,5 +80,12 @@
 TESTSPEC_RTEMS = recordTestHarness.boot; epicsRunRecordTests
 
 TESTSCRIPTS_HOST += $(TESTS:%=%.t)
+ifeq ($(T_A),RTEMS-pc386)
+TESTPROD_RTEMS = $(TESTPROD_HOST)
+TESTSCRIPTS_RTEMS += $(TESTS:%=%.t)
+endif
 
 include $(TOP)/configure/RULES
+
+rtemsTestData.c : $(TESTFILES) $(TOOLS)/epicsMakeMemFs.pl
+	$(PERL) $(TOOLS)/epicsMakeMemFs.pl $@ epicsRtemsFSImage $(TESTFILES)
 
=== modified file 'src/tools/Makefile'
--- src/tools/Makefile	2016-02-27 00:16:26 +0000
+++ src/tools/Makefile	2016-03-01 02:02:15 +0000
@@ -46,6 +46,7 @@
 PERL_SCRIPTS += mkmf.pl
 PERL_SCRIPTS += munch.pl
 PERL_SCRIPTS += replaceVAR.pl
+PERL_SCRIPTS += epicsMakeMemFs.pl
 PERL_SCRIPTS += useManifestTool.pl
 PERL_SCRIPTS += genVersionHeader.pl
 
 
=== added file 'src/tools/epicsMakeMemFs.pl'
--- src/tools/epicsMakeMemFs.pl	1970-01-01 00:00:00 +0000
+++ src/tools/epicsMakeMemFs.pl	2016-03-01 02:02:15 +0000
@@ -0,0 +1,83 @@
+#!/usr/bin/env perl
+#
+
+use File::Basename;
+
+use strict;
+
+my $outfile = shift;
+my $varname = shift;
+
+open(my $DST, '>', $outfile) or die "Failed to open $outfile";
+
+print $DST <<EOF;
+#include <epicsMemFs.h>
+EOF
+
+my $N = 0;
+
+for my $fname (@ARGV) {
+  print "<- $fname\n";
+  my $realfname = $fname;
+
+  # strip leading "../" "./" or "/"
+  while ($fname =~ /^\.*\/(.*)$/) { $fname = $1; }
+
+  my $file = basename($fname);
+  my @dirs  = split('/', dirname($fname));
+
+  print $DST "/* begin $realfname */\nstatic const char * const file_${N}_dir[] = {";
+  for my $dpart (@dirs) {
+    print $DST "\"$dpart\", ";
+  }
+  print $DST "NULL};\nstatic const char file_${N}_data[] = {\n   ";
+
+  open(my $SRC, '<', $realfname) or die "Failed to open $realfname";
+  binmode($SRC);
+
+  my $buf;
+  my $total = 0;
+  while (my $num = read($SRC, $buf, 32)) {
+    if($total != 0) {
+      print $DST ",\n   ";
+    }
+    $total += $num;
+    my $out = join(",",map(ord,split(//,$buf)));
+    print $DST "$out";
+  }
+  
+  close($SRC);
+
+  print $DST <<EOF;
+
+};
+static const epicsMemFile file_${N} = {
+  file_${N}_dir,
+  \"$file\",
+  file_${N}_data,
+  $total
+};
+/* end $realfname */
+EOF
+  $N = $N + 1;
+}
+
+print $DST <<EOF;
+static const epicsMemFile* files[] = {
+EOF
+
+$N = $N - 1;
+
+for my $i (0..${N}) {
+  print $DST " &file_${i},";
+}
+
+print $DST <<EOF;
+ NULL
+};
+static
+const epicsMemFS ${varname}_image = {&files[0]};
+const epicsMemFS * $varname = &${varname}_image;
+EOF
+
+close($DST);
 
=== modified file 'src/tools/makeTestfile.pl'
--- src/tools/makeTestfile.pl	2015-03-11 21:26:15 +0000
+++ src/tools/makeTestfile.pl	2016-03-01 02:02:15 +0000
@@ -15,17 +15,43 @@
 # 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
+# Usage: makeTestfile.pl <target-arch> <host-arch> target.t executable
+#     target-arch and host-arch are EPICS build target names (eg. linux-x86)
 #     target.t is the name of the Perl script to generate
 #     executable is the name of the file the script runs
 
 use strict;
 
-my ($target, $exe) = @ARGV;
+my ($TA, $HA, $target, $exe) = @ARGV;
+my $exec;
+
+# Use WINE to run windows target executables on non-windows host
+if( $TA =~ /^win32-x86/ && $HA !~ /^win/ ) {
+  $exec = "wine32 $exe";
+} elsif( $TA =~ /^windows-x64/ && $HA !~ /^win/ ) {
+  $exec = "wine64 $exe";
+
+# Run pc386 test harness w/ QEMU
+} elsif( $TA =~ /^RTEMS-pc386$/ ) {
+  $exec = "qemu-system-i386 -m 64 -no-reboot -serial stdio -display none -kernel $exe";
+
+# Explicitly fail for other RTEMS targets
+} elsif( $TA =~ /^RTEMS-/ ) {
+  die "I don't know how to run tests for $TA on $HA";
+
+} else {
+  $exec = "./$exe";
+}
 
 # 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'";
+if( $HA =~ /^win/ ) {
+  $exec = "system('$exec') == 0";
+
+# default to exec()
+} else {
+  $exec = "exec '$exec'";
+}
 
 open(my $OUT, '>', $target) or die "Can't create $target: $!\n";