From 6bdf70f01e700348bb4d8c064c31a0ab90896df6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 9 May 2017 14:35:03 +1000 Subject: clean up regress files and add a .gitignore --- .gitignore | 26 ++++++++++++++++++++++++++ Makefile.in | 19 ++++++++++--------- regress/Makefile | 33 ++++++++++++++++++--------------- 3 files changed, 54 insertions(+), 24 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..adb096449 --- /dev/null +++ b/.gitignore @@ -0,0 +1,26 @@ +Makefile +buildpkg.sh +config.h +config.h.in +config.status +configure +openbsd-compat/Makefile +openbsd-compat/regress/Makefile +openssh.xml +opensshd.init +survey.sh +**/*.o +**/*.out +**/*.a +autom4te.cache/ +scp +sftp +sftp-server +ssh +ssh-add +ssh-agent +ssh-keygen +ssh-keyscan +ssh-keysign +ssh-pkcs11-helper +sshd diff --git a/Makefile.in b/Makefile.in index d7f17df8c..29d539a73 100644 --- a/Makefile.in +++ b/Makefile.in @@ -228,26 +228,27 @@ umac128.o: umac.c clean: regressclean rm -f *.o *.a $(TARGETS) logintest config.cache config.log rm -f *.out core survey + rm -f regress/check-perm$(EXEEXT) rm -f regress/unittests/test_helper/*.a rm -f regress/unittests/test_helper/*.o rm -f regress/unittests/sshbuf/*.o - rm -f regress/unittests/sshbuf/test_sshbuf + rm -f regress/unittests/sshbuf/test_sshbuf$(EXEEXT) rm -f regress/unittests/sshkey/*.o - rm -f regress/unittests/sshkey/test_sshkey + rm -f regress/unittests/sshkey/test_sshkey$(EXEEXT) rm -f regress/unittests/bitmap/*.o - rm -f regress/unittests/bitmap/test_bitmap + rm -f regress/unittests/bitmap/test_bitmap$(EXEEXT) rm -f regress/unittests/conversion/*.o - rm -f regress/unittests/conversion/test_conversion + rm -f regress/unittests/conversion/test_conversion$(EXEEXT) rm -f regress/unittests/hostkeys/*.o - rm -f regress/unittests/hostkeys/test_hostkeys + rm -f regress/unittests/hostkeys/test_hostkeys$(EXEEXT) rm -f regress/unittests/kex/*.o - rm -f regress/unittests/kex/test_kex + rm -f regress/unittests/kex/test_kex$(EXEEXT) rm -f regress/unittests/match/*.o - rm -f regress/unittests/match/test_match + rm -f regress/unittests/match/test_match$(EXEEXT) rm -f regress/unittests/utf8/*.o - rm -f regress/unittests/utf8/test_utf8 + rm -f regress/unittests/utf8/test_utf8$(EXEEXT) rm -f regress/misc/kexfuzz/*.o - rm -f regress/misc/kexfuzz/kexfuzz + rm -f regress/misc/kexfuzz/kexfuzz$(EXEEXT) (cd openbsd-compat && $(MAKE) clean) distclean: regressclean diff --git a/regress/Makefile b/regress/Makefile index b23496b98..f968c4161 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -89,30 +89,33 @@ INTEROP_TESTS= putty-transfer putty-ciphers putty-kex conch-ciphers #LTESTS= cipher-speed -USERNAME!= id -un +USERNAME= ${LOGNAME} CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \ authorized_keys_${USERNAME}.* \ authorized_principals_${USERNAME} \ banner.in banner.out cert_host_key* cert_user_key* \ copy.1 copy.2 data ed25519-agent ed25519-agent* \ - ed25519-agent.pub empty.in expect failed-regress.log \ - failed-ssh.log failed-sshd.log hkr.* host.rsa host.rsa1 \ - host_* host_ca_key* host_krl_* host_revoked_* key.* \ - key.dsa-* key.ecdsa-* key.ed25519-512 key.ed25519-512.pub \ - key.rsa-* keys-command-args kh.* known_hosts \ - known_hosts-cert known_hosts.* krl-* ls.copy modpipe \ - netcat pidfile putty.rsa2 ready regress.log remote_pid \ - revoked-* rsa rsa-agent rsa-agent.pub rsa.pub rsa1 \ - rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \ + ed25519-agent.pub ed25519 ed25519.pub empty.in \ + expect failed-regress.log failed-ssh.log failed-sshd.log \ + hkr.* host.ed25519 host.rsa host.rsa1 host_* \ + host_ca_key* host_krl_* host_revoked_* key.* \ + key.dsa-* key.ecdsa-* key.ed25519-512 \ + key.ed25519-512.pub key.rsa-* keys-command-args kh.* \ + known_hosts known_hosts-cert known_hosts.* krl-* ls.copy \ + modpipe netcat no_identity_config \ + pidfile putty.rsa2 ready regress.log \ + remote_pid revoked-* rsa rsa-agent rsa-agent.pub rsa.pub \ + rsa1 rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \ rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \ scp-ssh-wrapper.scp setuid-allowed sftp-server.log \ sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \ ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \ - ssh_proxy_envpass sshd.log sshd_config sshd_config.orig \ - sshd_proxy sshd_proxy.* sshd_proxy_bak sshd_proxy_orig \ - t10.out t10.out.pub t12.out t12.out.pub t2.out t3.out \ - t6.out1 t6.out2 t7.out t7.out.pub t8.out t8.out.pub \ - t9.out t9.out.pub testdata user_*key* user_ca* user_key* + ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \ + sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \ + sshd_proxy_orig t10.out t10.out.pub t12.out t12.out.pub \ + t2.out t3.out t6.out1 t6.out2 t7.out t7.out.pub \ + t8.out t8.out.pub t9.out t9.out.pub testdata \ + user_*key* user_ca* user_key* SUDO_CLEAN+= /var/run/testdata_${USERNAME} /var/run/keycommand_${USERNAME} -- cgit v1.2.3