tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get BUILDDIR from autoconf. 

Use this to replace `pwd`s in regress test command line.
This commit is contained in:
Darren Tucker 2021-09-29 17:14:33 +10:00
parent c8d92d3d4f
commit 899be59da5
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile.in
View File

@ -17,6 +17,7 @@ piddir=@piddir@
srcdir=@srcdir@ srcdir=@srcdir@
top_srcdir=@top_srcdir@ top_srcdir=@top_srcdir@
abs_top_srcdir=@abs_top_srcdir@ abs_top_srcdir=@abs_top_srcdir@
abs_top_builddir=@abs_top_builddir@
DESTDIR= DESTDIR=
VPATH=@srcdir@ VPATH=@srcdir@
@ -30,6 +31,7 @@ PRIVSEP_PATH=@PRIVSEP_PATH@
SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
STRIP_OPT=@STRIP_OPT@ STRIP_OPT=@STRIP_OPT@
TEST_SHELL=@TEST_SHELL@ TEST_SHELL=@TEST_SHELL@
BUILDDIR=@abs_top_builddir@
PATHS= -DSSHDIR=\"$(sysconfdir)\" \ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@ -710,38 +712,36 @@ tests: file-tests t-exec interop-tests unit
echo all tests passed echo all tests passed
unit: regress-unit-binaries unit: regress-unit-binaries
BUILDDIR=`pwd`; \
cd $(srcdir)/regress || exit $$?; \ cd $(srcdir)/regress || exit $$?; \
$(MAKE) \ $(MAKE) \
.OBJDIR="$${BUILDDIR}/regress" \ .OBJDIR="$(BUILDDIR)/regress" \
.CURDIR="`pwd`" \ .CURDIR="`pwd`" \
OBJ="$${BUILDDIR}/regress" \ OBJ="$(BUILDDIR)/regress" \
$@ && echo $@ tests passed $@ && echo $@ tests passed
interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
BUILDDIR=`pwd`; \
cd $(srcdir)/regress || exit $$?; \ cd $(srcdir)/regress || exit $$?; \
EGREP='@EGREP@' \ EGREP='@EGREP@' \
$(MAKE) \ $(MAKE) \
.OBJDIR="$${BUILDDIR}/regress" \ .OBJDIR="$(BUILDDIR)/regress" \
.CURDIR="`pwd`" \ .CURDIR="`pwd`" \
BUILDDIR="$${BUILDDIR}" \ BUILDDIR="$(BUILDDIR)" \
OBJ="$${BUILDDIR}/regress/" \ OBJ="$(BUILDDIR)/regress/" \
PATH="$${BUILDDIR}:$${PATH}" \ PATH="$(BUILDDIR):$${PATH}" \
TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_SSH_SCP="$${BUILDDIR}/scp" \ TEST_SSH_SCP="$(BUILDDIR)/scp" \
TEST_SSH_SSH="$${BUILDDIR}/ssh" \ TEST_SSH_SSH="$(BUILDDIR)/ssh" \
TEST_SSH_SSHD="$${BUILDDIR}/sshd" \ TEST_SSH_SSHD="$(BUILDDIR)/sshd" \
TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent" \ TEST_SSH_SSHAGENT="$(BUILDDIR)/ssh-agent" \
TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add" \ TEST_SSH_SSHADD="$(BUILDDIR)/ssh-add" \
TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen" \ TEST_SSH_SSHKEYGEN="$(BUILDDIR)/ssh-keygen" \
TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \ TEST_SSH_SSHPKCS11HELPER="$(BUILDDIR)/ssh-pkcs11-helper" \
TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan" \ TEST_SSH_SSHKEYSCAN="$(BUILDDIR)/ssh-keyscan" \
TEST_SSH_SFTP="$${BUILDDIR}/sftp" \ TEST_SSH_SFTP="$(BUILDDIR)/sftp" \
TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \ TEST_SSH_PKCS11_HELPER="$(BUILDDIR)/ssh-pkcs11-helper" \
TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper" \ TEST_SSH_SK_HELPER="$(BUILDDIR)/ssh-sk-helper" \
TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server" \ TEST_SSH_SFTPSERVER="$(BUILDDIR)/sftp-server" \
TEST_SSH_MODULI_FILE="$(abs_top_srcdir)/moduli" \ TEST_SSH_MODULI_FILE="$(abs_top_srcdir)/moduli" \
TEST_SSH_PLINK="plink" \ TEST_SSH_PLINK="plink" \
TEST_SSH_PUTTYGEN="puttygen" \ TEST_SSH_PUTTYGEN="puttygen" \