Skip to content

Commit aa2a62d

Browse files
arif-pragmasysarif-pragmasys
committed
regress test related make file update for win32
1 parent 044abad commit aa2a62d

File tree

12 files changed

+825
-1
lines changed

12 files changed

+825
-1
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ pip-log.txt
224224
*.exe
225225
*.out
226226
*.a
227-
Makefile
227+
#Makefile
228228
config.status
229229
openssh.xml
230230
opensshd.init

‎Makefile

Lines changed: 616 additions & 0 deletions
Large diffs are not rendered by default.

‎contrib/win32/win32compat/Makefile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# $Id $
2+
3+
sysconfdir=${prefix}/etc
4+
piddir=/var/run
5+
srcdir=.
6+
top_srcdir=../../..
7+
8+
9+
CC=i686-pc-mingw32-gcc
10+
LD=i686-pc-mingw32-gcc
11+
CFLAGS=-g -O2 -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wno-pointer-sign -Wno-unused-result -fno-strict-aliasing -fno-builtin-memset -fstack-protector-all -I/cygdrive/c/openssh/Win32-OpenSSH/contrib/win32/win32compat/includes -I/cygdrive/c/openssh/Win32-OpenSSH/openbsd-compat -I/cygdrive/c/openssh/Win32-OpenSSH/contrib/win32/win32compat/includes -I/cygdrive/c/openssh/Win32-OpenSSH/libkrb -I/usr/local
12+
CPPFLAGS=-I. -I../../.. -I$(srcdir) -I$(top_srcdir) -I$(srcdir)/includes -I/cygdrive/c/openssh/openssl-1.0.2d/include -I/cygdrive/c/openssh/zlib-1.2.8 -DHAVE_CONFIG_H
13+
LIBS=-lcrypto -lz -lws2_32 -lgdi32 -lNetAPI32 -luserenv -lsecur32 -lshlwapi
14+
AR=/usr/bin/ar
15+
RANLIB=i686-pc-mingw32-ranlib
16+
INSTALL=/usr/bin/install -c
17+
LDFLAGS=-L. -L/cygdrive/c/openssh/openssl-1.0.2d -L/cygdrive/c/openssh/zlib-1.2.8 -fstack-protector-all
18+
19+
WIN32COMPATFILES = daemon.o gettimeofday.o homedirhelp.o pwd.o sfds.o \
20+
socket.o startupneeds.o strcasecmp.o syslog.o lsalogon.o lsastring.o \
21+
stringhelp.o deskright.o win32auth.o kerberos.o
22+
23+
WIN32COMPATLIB=libwin32compat.a
24+
25+
.c.o:
26+
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
27+
28+
all: $(WIN32COMPATLIB)
29+
30+
install:
31+
32+
clean:
33+
rm -f *.o *.a core
34+
35+
distclean: clean
36+
rm -f Makefile *~
37+
38+
$(WIN32COMPATFILES): ../../../config.h
39+
40+
$(WIN32COMPATLIB): $(WIN32COMPATFILES)
41+
$(AR) rv $@ $(WIN32COMPATFILES)
42+
$(RANLIB) $@

‎openbsd-compat/Makefile

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# $Id: Makefile.in,v 1.56 2014/09/30 23:43:08 djm Exp $
2+
3+
sysconfdir=${prefix}/etc
4+
piddir=/var/run
5+
srcdir=.
6+
top_srcdir=..
7+
8+
9+
CC=i686-pc-mingw32-gcc
10+
LD=i686-pc-mingw32-gcc
11+
CFLAGS=-g -O2 -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wno-pointer-sign -Wno-unused-result -fno-strict-aliasing -fno-builtin-memset -fstack-protector-all -I/cygdrive/c/openssh/Win32-OpenSSH/contrib/win32/win32compat/includes -I/cygdrive/c/openssh/Win32-OpenSSH/openbsd-compat -I/cygdrive/c/openssh/Win32-OpenSSH/contrib/win32/win32compat/includes -I/cygdrive/c/openssh/Win32-OpenSSH/libkrb -I/usr/local
12+
CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. -I/cygdrive/c/openssh/openssl-1.0.2d/include -I/cygdrive/c/openssh/zlib-1.2.8 -DHAVE_CONFIG_H
13+
LIBS=-lcrypto -lz -lws2_32 -lgdi32 -lNetAPI32 -luserenv -lsecur32 -lshlwapi
14+
AR=/usr/bin/ar
15+
RANLIB=i686-pc-mingw32-ranlib
16+
INSTALL=/usr/bin/install -c
17+
LDFLAGS=-L. -L/cygdrive/c/openssh/openssl-1.0.2d -L/cygdrive/c/openssh/zlib-1.2.8 -fstack-protector-all
18+
19+
OPENBSD=base64.o basename.o bcrypt_pbkdf.o bindresvport.o blowfish.o daemon.o dirname.o fmt_scaled.o getcwd.o getgrouplist.o getopt_long.o getrrsetbyname.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o pwcache.o readpassphrase.o reallocarray.o realpath.o rresvport.o setenv.o setproctitle.o sha1.o sha2.o rmd160.o md5.o sigact.o strlcat.o strlcpy.o strmode.o strnlen.o strptime.o strsep.o strtonum.o strtoll.o strtoul.o strtoull.o timingsafe_bcmp.o vis.o blowfish.o bcrypt_pbkdf.o explicit_bzero.o
20+
21+
COMPAT=arc4random.o bsd-asprintf.o bsd-closefrom.o bsd-cray.o bsd-cygwin_util.o bsd-getpeereid.o getrrsetbyname-ldns.o bsd-misc.o bsd-nextstep.o bsd-openpty.o bsd-poll.o bsd-setres_id.o bsd-snprintf.o bsd-statvfs.o bsd-waitpid.o fake-rfc2553.o openssl-compat.o xmmap.o xcrypt.o kludge-fd_set.o
22+
23+
PORTS=port-aix.o port-irix.o port-linux.o port-solaris.o port-tun.o port-uw.o
24+
25+
.c.o:
26+
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
27+
28+
all: libopenbsd-compat.a
29+
30+
$(COMPAT): ../config.h
31+
$(OPENBSD): ../config.h
32+
$(PORTS): ../config.h
33+
34+
libopenbsd-compat.a: $(COMPAT) $(OPENBSD) $(PORTS)
35+
$(AR) rv $@ $(COMPAT) $(OPENBSD) $(PORTS)
36+
$(RANLIB) $@
37+
38+
clean:
39+
rm -f *.o *.a core
40+
41+
distclean: clean
42+
rm -f Makefile *~

‎openbsd-compat/regress/Makefile

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# $Id: Makefile.in,v 1.5 2014/06/17 13:06:08 dtucker Exp $
2+
3+
sysconfdir=${prefix}/etc
4+
piddir=/var/run
5+
srcdir=.
6+
top_srcdir=../..
7+
8+
9+
CC=i686-pc-mingw32-gcc
10+
LD=i686-pc-mingw32-gcc
11+
CFLAGS=-g -O2 -Wall -Wpointer-arith -Wuninitialized -Wsign-compare -Wformat-security -Wno-pointer-sign -Wno-unused-result -fno-strict-aliasing -fno-builtin-memset -fstack-protector-all -I/cygdrive/c/openssh/Win32-OpenSSH/contrib/win32/win32compat/includes -I/cygdrive/c/openssh/Win32-OpenSSH/openbsd-compat -I/cygdrive/c/openssh/Win32-OpenSSH/contrib/win32/win32compat/includes -I/cygdrive/c/openssh/Win32-OpenSSH/libkrb -I/usr/local
12+
CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. -I/cygdrive/c/openssh/openssl-1.0.2d/include -I/cygdrive/c/openssh/zlib-1.2.8 -DHAVE_CONFIG_H
13+
EXEEXT=.exe
14+
LIBCOMPAT=../libopenbsd-compat.a
15+
LIBS=-lcrypto -lz -lws2_32 -lgdi32 -lNetAPI32 -luserenv -lsecur32 -lshlwapi
16+
LDFLAGS=-L/cygdrive/c/openssh/openssl-1.0.2d -L/cygdrive/c/openssh/zlib-1.2.8 -fstack-protector-all $(LIBCOMPAT)
17+
18+
TESTPROGS=closefromtest$(EXEEXT) snprintftest$(EXEEXT) strduptest$(EXEEXT) \
19+
strtonumtest$(EXEEXT) opensslvertest$(EXEEXT)
20+
21+
all: t-exec ${OTHERTESTS}
22+
23+
%$(EXEEXT): %.c $(LIBCOMPAT)
24+
$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $< $(LIBCOMPAT) $(LIBS)
25+
26+
t-exec: $(TESTPROGS)
27+
@echo running compat regress tests
28+
@for TEST in ""$?; do \
29+
echo "run test $${TEST}" ... 1>&2; \
30+
./$${TEST}$(EXEEXT) || exit $$? ; \
31+
done
32+
@echo finished compat regress tests
33+
34+
clean:
35+
rm -f *.o *.a core $(TESTPROGS) valid.out
36+
37+
distclean: clean
38+
rm -f Makefile *~

‎regress/unittests/Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# $OpenBSD: Makefile,v 1.5 2015/02/16 22:21:03 djm Exp $
2+
REGRESS_FAIL_EARLY= yes
3+
SUBDIR= test_helper sshbuf sshkey bitmap kex hostkeys
4+
5+
.include <bsd.subdir.mk>

‎regress/unittests/bitmap/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# $OpenBSD: Makefile,v 1.1 2015/01/15 07:36:28 djm Exp $
2+
3+
TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
4+
5+
PROG=test_bitmap
6+
SRCS=tests.c
7+
REGRESS_TARGETS=run-regress-${PROG}
8+
9+
run-regress-${PROG}: ${PROG}
10+
env ${TEST_ENV} ./${PROG}
11+
12+
.include <bsd.regress.mk>

‎regress/unittests/hostkeys/Makefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# $OpenBSD: Makefile,v 1.1 2015/02/16 22:18:34 djm Exp $
2+
3+
TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
4+
5+
PROG=test_hostkeys
6+
SRCS=tests.c test_iterate.c
7+
REGRESS_TARGETS=run-regress-${PROG}
8+
9+
run-regress-${PROG}: ${PROG}
10+
env ${TEST_ENV} ./${PROG} -d ${.CURDIR}/testdata
11+
12+
.include <bsd.regress.mk>

‎regress/unittests/kex/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# $OpenBSD: Makefile,v 1.2 2015/01/24 10:39:21 miod Exp $
2+
3+
TEST_ENV= "MALLOC_OPTIONS=AFGJPRX"
4+
5+
PROG=test_kex
6+
SRCS=tests.c test_kex.c
7+
REGRESS_TARGETS=run-regress-${PROG}
8+
9+
run-regress-${PROG}: ${PROG}
10+
env ${TEST_ENV} ./${PROG}
11+
12+
.include <bsd.regress.mk>
13+
14+
LDADD+=-lz

‎regress/unittests/sshbuf/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# $OpenBSD: Makefile,v 1.1 2014/04/30 05:32:00 djm Exp $
2+
3+
PROG=test_sshbuf
4+
SRCS=tests.c
5+
SRCS+=test_sshbuf.c
6+
SRCS+=test_sshbuf_getput_basic.c
7+
SRCS+=test_sshbuf_getput_crypto.c
8+
SRCS+=test_sshbuf_misc.c
9+
SRCS+=test_sshbuf_fuzz.c
10+
SRCS+=test_sshbuf_getput_fuzz.c
11+
SRCS+=test_sshbuf_fixed.c
12+
13+
.include <bsd.regress.mk>
14+

0 commit comments

Comments
 (0)