public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jon Turney <jturney@sourceware.org>
To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: teststuite: Use Busybox executables for system() tests
Date: Sun,  9 Jul 2023 16:01:54 +0000 (GMT)	[thread overview]
Message-ID: <20230709160154.C9E8E3857C4F@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=4b54e1a1656cadb6bc8af971e6a023f882ce158d

commit 4b54e1a1656cadb6bc8af971e6a023f882ce158d
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Jul 9 12:12:50 2023 +0100

    Cygwin: teststuite: Use Busybox executables for system() tests
    
    Use BusyBox to provide executables needed by tests which use system().

Diff:
---
 .github/workflows/cygwin.yml |  1 +
 winsup/testsuite/Makefile.am | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index d1b32f823..248a3e4cd 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -71,6 +71,7 @@ jobs:
         packages: >-
           autoconf,
           automake,
+          busybox,
           cocom,
           dblatex,
           dejagnu,
diff --git a/winsup/testsuite/Makefile.am b/winsup/testsuite/Makefile.am
index 824bf3361..aa39f6ce1 100644
--- a/winsup/testsuite/Makefile.am
+++ b/winsup/testsuite/Makefile.am
@@ -355,12 +355,19 @@ EXTRA_DEJAGNU_SITE_CONFIG = site-extra.exp
 #
 # * Create /tmp
 # * Ensure there is a /usr/bin/sh for tests which use system()
-# * Ensure there is a /usr/bin/sleep for tests which use system('sleep 10')
+# * Ensure there is a /usr/bin/sleep for tests which use system("sleep 10")
+# * Ensure there is a /usr/bin/ls for tests which  use system("ls")
 #
+# copy to avoid all the complexities: hardlink will fail if builddir is on a
+# separate filesystem, symlink would need to be constructed with regard to the
+# mounts of the test installation, and making it into /bin/ will cause
+# CreateProcess() to load cygwin1.dll from there.
+
 check-local:
 	$(MKDIR_P) ${builddir}/testinst/tmp
-	cd ${builddir}/testinst/bin && ln -sf /usr/bin/dash.exe sh.exe
-	cd ${builddir}/testinst/bin && ln -sf /usr/bin/sleep.exe sleep.exe
+	cd ${builddir}/testinst/bin && cp /usr/libexec/busybox/bin/busybox.exe sh.exe
+	cd ${builddir}/testinst/bin && cp /usr/libexec/busybox/bin/busybox.exe sleep.exe
+	cd ${builddir}/testinst/bin && cp /usr/libexec/busybox/bin/busybox.exe ls.exe
 
 # target to build all the programs needed by check, without running check
 check_programs: $(check_PROGRAMS)

                 reply	other threads:[~2023-07-09 16:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230709160154.C9E8E3857C4F@sourceware.org \
    --to=jturney@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).