commit 170451040ea6482e4b07aa781eea1d2277bc49f8 from: Sergey Bronnikov date: Fri Dec 20 17:41:46 2013 UTC - set correct path to bsd.autotest.mk - add ${TEST} to all Makefiles - show name of package on installation - forbid sysupgrade run without root priveleges commit - a5e6d622aa51e50d72270070a13149411140f8d6 commit + 170451040ea6482e4b07aa781eea1d2277bc49f8 blob - 8009058780cde18ad47568e9f3937f896f3bd8d2 blob + b561674ff3de3890aed46c5924a99171aa0ae5de --- README.md +++ README.md @@ -9,10 +9,9 @@ Sergey Bronnikov, BSD License ### TODO -* installation on node with Linux (depinguinator for OpenBSD?) * openup http://www.mtier.org/solutions/apps/openup/ * add support of ONLY_FOR_ARCHS and NOT_FOR_ARCHS -* report (http://www.openbsd.org/report.html) +* report (see http://www.openbsd.org/report.html) /var/log/Xorg.0.log /var/run/dmesg.boot dmesg(8), usbdevs(8), pcidump(8), and acpidump(8) blob - f0da417443821a9657d72d03eec2b066ac676d4c blob + 3243231b367f44cae513011e78deabf35df0b7a0 --- fuse/Makefile +++ fuse/Makefile @@ -6,7 +6,7 @@ LDFLAGS = -lfuse PKG_REQUIRED = fsx fsstress TEST = fuse -REGRESS_LOG = ${.CURDIR}/fuse-`date +%Y-%m-%d`.log +REGRESS_LOG = ${.CURDIR}/${TEST}-`date +%Y-%m-%d`.log REGRESS_TARGETS = run-regress-fuse-hdd REGRESS_ROOT_TARGETS= run-regress-fuse-hdd @@ -40,4 +40,4 @@ run-regress-fuse-tmpfs: fusexmp @fusexmp fsx /mnt/fuse -.include <../infrastructure/bsd.autotest.mk> +.include <../infrastructure/mk/bsd.autotest.mk> blob - 663710ee998b80bfe1626d0aae8528cd66242c9f (mode 644) blob + 663710ee998b80bfe1626d0aae8528cd66242c9f (mode 755) blob - 2fd95162eea2a7d1861a238da5b8c8b6322bd687 blob + 994f135711c51d41a88f573658a6333b7b107f7a --- infrastructure/bin/sysupgrade +++ infrastructure/bin/sysupgrade @@ -3,6 +3,7 @@ # Current version: 1.8 (2011-05-04) # https://github.com/jkossen/obu + VERSION='54' NEW_BOOTBLOCKS="no" BOOTDISK='ad0' @@ -179,9 +180,7 @@ download_files() cd "$DOWNLOADDIR" || fail - if [ ${MIRROR#file://} != $MIRROR ]; then - DFUN="download_file_file" - elif [ ${MIRROR#ftp://} != $MIRROR ]; then + if [ ${MIRROR#ftp://} != $MIRROR ]; then DFUN="download_file_ftp" elif [ ${MIRROR#http://} != $MIRROR ]; then DFUN="download_file_ftp" @@ -439,6 +438,7 @@ unset showchanges # run case $1 in bootblocks) + [ `id -u` -ne 0 ] && echo "Root priveleges required."; exit 1 install_bootblocks ;; check) @@ -446,6 +446,7 @@ case $1 in check_sum_all ;; update) + [ `id -u` -ne 0 ] && echo "Root priveleges required."; exit 1 sets_to_filenames run_hooks $HOOKS_PRE_DOWNLOAD download_files @@ -459,6 +460,7 @@ case $1 in fi ;; upgrade) + [ `id -u` -ne 0 ] && echo "Root priveleges required."; exit 1 sets_to_filenames if [ "$CHECKSUM_ON_UPGRADE" = "yes" ]; then check_sum_all || abort @@ -472,6 +474,7 @@ case $1 in msg_final ;; post-reboot) + [ `id -u` -ne 0 ] && echo "Root priveleges required."; exit 1 sets_to_filenames run_hooks $HOOKS_POST_INSTALL check_reboot_backup @@ -479,10 +482,12 @@ case $1 in msg_final ;; mergecfg) + [ `id -u` -ne 0 ] && echo "Root priveleges required."; exit 1 sets_to_filenames merge_etc ;; full) + [ `id -u` -ne 0 ] && echo "Root priveleges required."; exit 1 sets_to_filenames run_hooks $HOOKS_PRE_DOWNLOAD download_files blob - 3ea495de0b38e33687cc692017e924d2da56789b blob + 8d8acaba266d5c69d8443e68c506192d7f8207a3 --- infrastructure/mk/bsd.autotest.mk +++ infrastructure/mk/bsd.autotest.mk @@ -20,7 +20,7 @@ all: preparation upgrade regress report cleanup preparation: . if defined(PKG_REQUIRED) @for package in ${PKG_REQUIRED}; do \ - (set -e; pkg_add $${package} || exit 1); \ + (set -e; echo -n "install $${package} "; pkg_add $${package} && echo "done" || exit 1); \ done; . endif . if defined(REPORT_HTTP) blob - 9952160095994ee1377954f2a08e7bdc8b7c9167 blob + 0e4010ce8536d5b93ce4ee77e6056d4af90391d2 --- isic/Makefile +++ isic/Makefile @@ -3,7 +3,7 @@ TEST = isic PKG_REQUIRED = isic -REGRESS_LOG = ${.CURDIR}/isic-`date +%Y-%m-%d`.log +REGRESS_LOG = ${.CURDIR}/${TEST}-`date +%Y-%m-%d`.log REGRESS_ROOT_TARGETS = run-regress-isic-tcp REGRESS_ROOT_TARGETS += run-regress-isic-udp REGRESS_ROOT_TARGETS += run-regress-isic-icmp blob - 6edffafb536b2a32b993588c8475471cdfb65085 blob + b85bc798b90aa35d287d53f45c844b2fa7b96a00 --- memtester/Makefile +++ memtester/Makefile @@ -1,9 +1,9 @@ -COMMENT= test for memory faults +TEST = memtester PKG_REQUIRED = memtester LOOP = 1 AMOUNT != sysctl -n hw.physmem -REGRESS_LOG = ${.CURDIR}/memtester.log +REGRESS_LOG = ${.CURDIR}/${TEST}-`date +%Y-%m-%d`.log REGRESS_TARGETS = run-regress-test-memtester run-regress-test-memtester: blob - 64304b094149e0a5da71a3098834519d9a12cd80 blob + d99e9159ab5a5fefc15c8534a71ae6679c8f586b --- openssl/Makefile +++ openssl/Makefile @@ -1,20 +1,14 @@ -COMMENT = OpenSSL +TEST = openssl -REGRESS_LOG = ${.CURDIR}/openssl.log -REGRESS_TARGETS = run-regress-openssl-md5 run-regress-openssl-rand \ - run-regress-openssl-usage -REGRESS_SKIP_TARGETS = run-regress-openssl-usage +REGRESS_LOG = ${.CURDIR}/${TEST}-`date +%Y-%m-%d`.log +REGRESS_TARGETS = run-regress-${TEST}-md5 run-regress-${TEST}-rand -run-regress-openssl-md5: +run-regress-${TEST}-md5: @echo -n "OpenSSL MD5: " @openssl md5 Makefile -run-regress-openssl-rand: +run-regress-${TEST}-rand: @echo -n "OpenSSL random: " @openssl rand -base64 12 -run-regress-openssl-usage: - @echo -n "OpenSSL usage: " - @openssl help - .include <../infrastructure/mk/bsd.autotest.mk> blob - b0fb920f695058c782c31e6bc27d39cd3e46857f blob + 21a1bf74dffe7425951a64060dac6de98ee93005 --- x11perf/Makefile +++ x11perf/Makefile @@ -1,8 +1,12 @@ -PKG_REQUIRED = x11perf +TEST = x11perf + +X11_REQUIRED = Yes + REGRESS_LOG = ${.CURDIR}/${TEST}-`date +%Y-%m-%d`.log -REGRESS_TARGETS = run-regress-test-x11perf +REGRESS_TARGETS = run-regress-test-${TEST} +REGRESS_MAX_TIME ?= 3600 -run-regress-test-x11perf: - @x11perf -all +run-regress-test-${TEST}: + @x11perf -all -.include <../infrastructure/bsd.autotest.mk> +.include <../infrastructure/mk/bsd.autotest.mk>