[OSSTEST,48/82] shared/reuse: Use @ for freebsd host prep

Commit Message

Ian Jackson Oct. 7, 2020, 5:59 p.m. UTC

From: Ian Jackson <[e-mail]>

These are all the relevant call sites for ts-freebsd-host-install and
ts-freebsd-build-prep.  (There's a ts-freebsd-host-install in
ts-memdisk-try-append but that's for host examination and does not
uee or want sharing or reuse.)

Signed-off-by: Ian Jackson <[e-mail]>
---
 sg-run-job              | 12 +++++++++---
 ts-build-prep-freebsd   |  1 -
 ts-freebsd-host-install |  1 -
 3 files changed, 9 insertions(+), 5 deletions(-)

Patch

diff --git a/sg-run-job b/sg-run-job
index c454d4ea..0b2e20e7 100755
--- a/sg-run-job
+++ b/sg-run-job
@@ -758,9 +758,15 @@  proc prepare-build-host-linux {} {
 
 proc prepare-build-host-freebsd {} {
     global jobinfo
-    if {[recipe-flag testinstall]} { set broken fail } { set broken broken }
-    run-ts $broken host-install(*) ts-freebsd-host-install
-    run-ts . host-build-prep ts-build-prep-freebsd
+    if {[recipe-flag testinstall]} {
+	set broken fail
+	set isprep {}
+    } {
+	set broken broken
+	set isprep @
+    }
+    run-ts $broken host-install(*) ts-freebsd-host-install + ${isprep}host
+    run-ts . host-build-prep ts-build-prep-freebsd + ${isprep}host
 }
 
 proc need-hosts/coverity {} { return BUILD_LINUX }
diff --git a/ts-build-prep-freebsd b/ts-build-prep-freebsd
index ef880503..9606c0f7 100755
--- a/ts-build-prep-freebsd
+++ b/ts-build-prep-freebsd
@@ -28,7 +28,6 @@  tsreadconfig();
 our ($whhost) = @ARGV;
 $whhost ||= 'host';
 our $ho= selecthost($whhost);
-exit 0 if $ho->{SharedReady};
 
 sub install_deps () {
     my @packages = qw(git glib pkgconf yajl gmake pixman markdown gettext
diff --git a/ts-freebsd-host-install b/ts-freebsd-host-install
index 3c3e9c34..9feb98cd 100755
--- a/ts-freebsd-host-install
+++ b/ts-freebsd-host-install
@@ -65,7 +65,6 @@  our ($whhost) = @ARGV;
 $whhost ||= 'host';
 our $ho= selecthost($whhost);
 exit 0 if $ho->{Flags}{'no-reinstall'};
-exit 0 if $ho->{SharedReady};
 
 our $timeout = 1000;