run: non-fatal exit on unsupported base build config

The kernel-specific boot dir scripts exit with 0 and log "Test
requires..." to inform the logger frontend of the base-archive
unavailability.
This commit is contained in:
Christian Helmuth 2018-04-16 13:33:20 +02:00
parent 761d75423d
commit 169d5bc376
7 changed files with 61 additions and 10 deletions

View File

@ -106,5 +106,13 @@ proc run_boot_dir {binaries} {
##
# Base source archive within depot
#
proc base_src { } { return base-fiasco }
proc base_src { } {
if {[have_spec x86_32]} { return base-fiasco }
global specs
puts stderr "Test requires base-fiasco kernel archive, which is missing for this build configuration"
puts stderr " SPECS=\"$specs\""
exit 0
}

View File

@ -213,5 +213,13 @@ proc run_boot_dir {binaries} {
##
# Base source archive within depot
#
proc base_src { } { return base-foc }
proc base_src { } {
if {[have_spec x86]} { return base-foc }
global specs
puts stderr "Test requires base-foc kernel archive, which is missing for this build configuration"
puts stderr " SPECS=\"$specs\""
exit 0
}

View File

@ -202,9 +202,12 @@ proc run_boot_dir {binaries} {
#
proc base_src { } {
if {[have_spec x86_64]} { return base-hw-pc }
if {[have_spec pbxa9]} { return base-hw-pbxa9 }
if {[have_spec x86_64] && ![have_spec muen]} { return base-hw-pc }
if {[have_spec pbxa9]} { return base-hw-pbxa9 }
puts stderr "base-hw kernel does not support this build configuration"
exit 1
global specs
puts stderr "Test requires base-hw kernel archive, which is missing for this build configuration"
puts stderr " SPECS=\"$specs\""
exit 0
}

View File

@ -135,5 +135,13 @@ proc run_boot_dir {binaries} {
##
# Base source archive within depot
#
proc base_src { } { return base-nova }
proc base_src { } {
if {[have_spec x86]} { return base-nova }
global specs
puts stderr "Test requires base-nova kernel archive, which is missing for this build configuration"
puts stderr " SPECS=\"$specs\""
exit 0
}

View File

@ -203,5 +203,13 @@ proc run_boot_dir {binaries} {
##
# Base source archive within depot
#
proc base_src { } { return base-okl4 }
proc base_src { } {
if {[have_spec x86_32]} { return base-okl4 }
global specs
puts stderr "Test requires base-okl4 kernel archive, which is missing for this build configuration"
puts stderr " SPECS=\"$specs\""
exit 0
}

View File

@ -103,5 +103,13 @@ proc run_boot_dir {binaries} {
##
# Base source archive within depot
#
proc base_src { } { return base-pistachio }
proc base_src { } {
if {[have_spec x86_32]} { return base-pistachio }
global specs
puts stderr "Test requires base-pistachio kernel archive, which is missing for this build configuration"
puts stderr " SPECS=\"$specs\""
exit 0
}

View File

@ -142,5 +142,13 @@ proc run_boot_dir {binaries} {
##
# Base source archive within depot
#
proc base_src { } { return base-sel4 }
proc base_src { } {
if {[have_spec x86]} { return base-sel4 }
global specs
puts stderr "Test requires base-sel4 kernel archive, which is missing for this build configuration"
puts stderr " SPECS=\"$specs\""
exit 0
}