diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/mbf/main.go | 2 | ||||
| -rw-r--r-- | cmd/mbf/main_test.go | 2 | ||||
| -rw-r--r-- | cmd/sharefs/test/configuration.nix | 5 | ||||
| -rw-r--r-- | cmd/sharefs/test/default.nix | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/cmd/mbf/main.go b/cmd/mbf/main.go index 030d9325..65d563be 100644 --- a/cmd/mbf/main.go +++ b/cmd/mbf/main.go @@ -93,7 +93,7 @@ func main() { if !flagLTO { flags |= rosa.OptLLVMNoLTO } - rosa.DropCaches(flags) + rosa.DropCaches("", flags) return nil }).Flag( diff --git a/cmd/mbf/main_test.go b/cmd/mbf/main_test.go index 8f0d0894..a5b33e90 100644 --- a/cmd/mbf/main_test.go +++ b/cmd/mbf/main_test.go @@ -9,7 +9,7 @@ import ( ) func TestMain(m *testing.M) { - rosa.DropCaches(rosa.OptLLVMNoLTO) + rosa.DropCaches("", rosa.OptLLVMNoLTO) os.Exit(m.Run()) } diff --git a/cmd/sharefs/test/configuration.nix b/cmd/sharefs/test/configuration.nix index e1f43b72..05d67dcb 100644 --- a/cmd/sharefs/test/configuration.nix +++ b/cmd/sharefs/test/configuration.nix @@ -20,11 +20,14 @@ }; virtualisation = { + # Hopefully reduces spurious test failures: + memorySize = if pkgs.stdenv.hostPlatform.is32bit then 2046 else 8192; + diskSize = 6 * 1024; qemu.options = [ # Increase test performance: - "-smp 8" + "-smp 16" ]; }; diff --git a/cmd/sharefs/test/default.nix b/cmd/sharefs/test/default.nix index 53ab8fc2..e963eaa6 100644 --- a/cmd/sharefs/test/default.nix +++ b/cmd/sharefs/test/default.nix @@ -28,7 +28,7 @@ testers.nixosTest { # For go tests: (pkgs.writeShellScriptBin "sharefs-workload-hakurei-tests" '' cp -r "${self.packages.${system}.hakurei.src}" "/sdcard/hakurei" && cd "/sdcard/hakurei" - ${fhs}/bin/hakurei-fhs -c 'CC="clang -O3 -Werror" go test ./...' + ${fhs}/bin/hakurei-fhs -c 'ROSA_SKIP_BINFMT=1 CC="clang -O3 -Werror" go test ./...' '') ]; |