build: add test build target.
This commit is contained in:
parent
b471f8359a
commit
d9ff4aecd7
4 changed files with 21 additions and 0 deletions
8
Justfile
8
Justfile
|
|
@ -65,11 +65,19 @@ build:
|
||||||
enforce: build
|
enforce: build
|
||||||
@./{{build}}/prebuild --buildir {{build}}
|
@./{{build}}/prebuild --buildir {{build}}
|
||||||
|
|
||||||
|
# Prebuild the profiles in enforce mode (test)
|
||||||
|
enforce-test: build
|
||||||
|
@./{{build}}/prebuild --buildir {{build}} --test
|
||||||
|
|
||||||
# Prebuild the profiles in complain mode
|
# Prebuild the profiles in complain mode
|
||||||
[group('build')]
|
[group('build')]
|
||||||
complain: build
|
complain: build
|
||||||
./{{build}}/prebuild --buildir {{build}} --complain
|
./{{build}}/prebuild --buildir {{build}} --complain
|
||||||
|
|
||||||
|
# Prebuild the profiles in complain mode (test)
|
||||||
|
complain-test: build
|
||||||
|
@./{{build}}/prebuild --buildir {{build}} --complain --test
|
||||||
|
|
||||||
# Prebuild the profiles in FSP mode
|
# Prebuild the profiles in FSP mode
|
||||||
[group('build')]
|
[group('build')]
|
||||||
fsp: build
|
fsp: build
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ Options:
|
||||||
-s, --server Set AppArmor for server.
|
-s, --server Set AppArmor for server.
|
||||||
-b, --buildir DIR Root build directory.
|
-b, --buildir DIR Root build directory.
|
||||||
-F, --file Only prebuild a given file.
|
-F, --file Only prebuild a given file.
|
||||||
|
--test Enable test mode.
|
||||||
--debug Enable debug mode.
|
--debug Enable debug mode.
|
||||||
`
|
`
|
||||||
)
|
)
|
||||||
|
|
@ -48,6 +49,7 @@ var (
|
||||||
full bool
|
full bool
|
||||||
server bool
|
server bool
|
||||||
debug bool
|
debug bool
|
||||||
|
test bool
|
||||||
abi int
|
abi int
|
||||||
version float64
|
version float64
|
||||||
file string
|
file string
|
||||||
|
|
@ -74,6 +76,7 @@ func init() {
|
||||||
flag.StringVar(&buildir, "b", "", "Root build directory.")
|
flag.StringVar(&buildir, "b", "", "Root build directory.")
|
||||||
flag.StringVar(&buildir, "buildir", "", "Root build directory.")
|
flag.StringVar(&buildir, "buildir", "", "Root build directory.")
|
||||||
flag.BoolVar(&debug, "debug", false, "Enable debug mode.")
|
flag.BoolVar(&debug, "debug", false, "Enable debug mode.")
|
||||||
|
flag.BoolVar(&test, "test", false, "Enable test mode.")
|
||||||
}
|
}
|
||||||
|
|
||||||
func Configure() {
|
func Configure() {
|
||||||
|
|
@ -118,6 +121,9 @@ func Configure() {
|
||||||
if debug {
|
if debug {
|
||||||
builder.Register("debug")
|
builder.Register("debug")
|
||||||
}
|
}
|
||||||
|
if test {
|
||||||
|
prebuild.Test = true
|
||||||
|
}
|
||||||
} else if enforce {
|
} else if enforce {
|
||||||
builder.Register("enforce")
|
builder.Register("enforce")
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,10 @@ func filterRuleForUs(opt *Option) bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if prebuild.Test && slices.Contains(opt.ArgList, "test") {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
abiStr := fmt.Sprintf("abi%d", prebuild.ABI)
|
abiStr := fmt.Sprintf("abi%d", prebuild.ABI)
|
||||||
if slices.Contains(opt.ArgList, abiStr) {
|
if slices.Contains(opt.ArgList, abiStr) {
|
||||||
return true
|
return true
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,9 @@ var (
|
||||||
// Either or not RBAC is enabled
|
// Either or not RBAC is enabled
|
||||||
RBAC = false
|
RBAC = false
|
||||||
|
|
||||||
|
// Either or not we are in test mode
|
||||||
|
Test = false
|
||||||
|
|
||||||
// Pkgname is the name of the package
|
// Pkgname is the name of the package
|
||||||
Pkgname = "apparmor.d"
|
Pkgname = "apparmor.d"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue