From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id C9E8E3857C4F; Sun, 9 Jul 2023 16:01:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C9E8E3857C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688918514; bh=aC966Bi0xbFy+JX0fAV3IEbG17MA7p/Rqu99D+TiGHE=; h=From:To:Subject:Date:From; b=ZWujoNrjBbEOJPnT1x9j9Gadea3dvOhU1eM1FHU15zEeQqhaJ1T2k6R6hq0lkv2oN SavHfiWqKmAz5NoyzS5z6oaVtzf/2O2sZxFJ0yO3wm2JXsd6moeWuroYA1jUgC8CSt /oI9fhEZKB0mAxoYKIiFOXiU+J3PYGTAYCG9dKBY= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon Turney To: cygwin-cvs@sourceware.org, newlib-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: teststuite: Use Busybox executables for system() tests X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: f5940dc449177a3b6216515855964b0c8815954f X-Git-Newrev: 4b54e1a1656cadb6bc8af971e6a023f882ce158d Message-Id: <20230709160154.C9E8E3857C4F@sourceware.org> Date: Sun, 9 Jul 2023 16:01:54 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D4b54e1a1656= cadb6bc8af971e6a023f882ce158d commit 4b54e1a1656cadb6bc8af971e6a023f882ce158d Author: Jon Turney Date: Sun Jul 9 12:12:50 2023 +0100 Cygwin: teststuite: Use Busybox executables for system() tests =20 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 =3D 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 sl= eep.exe + cd ${builddir}/testinst/bin && cp /usr/libexec/busybox/bin/busybox.exe ls= .exe =20 # target to build all the programs needed by check, without running check check_programs: $(check_PROGRAMS)