Date: Wed, 9 Apr 2025 20:54:03 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1b16d033f4e5 - main - full-test.sh: Make the path per-os not per-user Message-ID: <202504092054.539Ks31j038251@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1b16d033f4e5f1dd6c3dd212a03f9f4f9be7e94d commit 1b16d033f4e5f1dd6c3dd212a03f9f4f9be7e94d Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2025-04-09 20:53:33 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2025-04-09 20:53:33 +0000 full-test.sh: Make the path per-os not per-user The default should be per-os, not per user. this lets me use this on both my mac and my FreeBSD server. Sponsored by: Netflix --- tools/boot/full-test.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/boot/full-test.sh b/tools/boot/full-test.sh index 43967913e76f..0b1bc500b3a4 100644 --- a/tools/boot/full-test.sh +++ b/tools/boot/full-test.sh @@ -51,9 +51,11 @@ case $(uname) in else die "Can't find the make wrapper" fi + qemu_bin=/opt/homebrew/bin ;; FreeBSD) MAKE=make + qemu_bin=/usr/local/bin ;; # linux) not yet *) @@ -71,12 +73,6 @@ MTREE=$(SHELL="which mtree" ${MAKE} ${DEFARCH} buildenv | tail -1) || die "No mt # MAKE=$(SHELL="which make" ${MAKE} ${DEFARCH} buildenv | tail -1) || die "No make, try buildworld first" -# hack -- I have extra junk in my qemu, but it's not needed to recreate things -if [ $(whoami) = imp ]; then - qemu_bin=/home/imp/git/qemu/00-build -else - qemu_bin=/usr/local/bin -fi # All the architectures under test # Note: we can't yet do armv7 because we don't have a good iso for it and would
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202504092054.539Ks31j038251>