Skip to content

Commit

Permalink
tests: kernels: Rename empty kernel to default
Browse files Browse the repository at this point in the history
More descriptive name.
  • Loading branch information
danobi committed Sep 5, 2024
1 parent 2466d90 commit 4c7c558
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# For images and kernels, see https://github.com/danobi/vmtest/releases/tag/test_assets for available assets.
IMAGES := image-not-uefi.raw image-uefi.raw-efi
KERNELS := bzImage-v5.15-empty bzImage-v6.2-empty
KERNELS := bzImage-v5.15-default bzImage-v6.2-default

ASSET_DIRECTORY := tests/.assets
IMAGES_FILES := $(foreach image,$(IMAGES),$(ASSET_DIRECTORY)/$(image))
Expand Down
2 changes: 1 addition & 1 deletion docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Mount host tmpfs inside guest with read/write permissions:
```toml
[[target]]
name = "test"
kernel = "/home/dlxu/scratch/bzImage-v6.6-empty"
kernel = "/home/dlxu/scratch/bzImage-v6.6-default"
command = "ls -l /tmp/hosttmp"
[target.vm.mounts]
"/tmp/hosttmp" = { host_path = "/tmp", writable = true }
Expand Down
4 changes: 2 additions & 2 deletions scripts/build_kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ if [[ $# -lt 1 || $# -gt 2 ]]; then
exit 1
fi

# Use empty config file if no distro is specified
DISTRO=${2:-empty}
# Use default config file if no distro is specified
DISTRO=${2:-default}

# Unique identifier for the kernel being built
IDENTIFIER="$1"-"$DISTRO"
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/config_kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -eux
# Start with a distro config
cp "kernels/${1}" .config

# If an empty config was provided, then we need to start with defconfig
# If an default config was provided, then we need to start with defconfig
# to get a sane config. Otherwise, all we need to do is default out the
# new or unset configs.
if [[ -s .config ]]; then
Expand Down
10 changes: 5 additions & 5 deletions tests/KERNELS
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
v5.15 empty
v5.15 default
v5.15 archlinux
v5.15 fedora38

v6.0 empty
v6.0 default
v6.0 archlinux
v6.0 fedora38

v6.1 empty
v6.1 default
v6.1 archlinux
v6.1 fedora38

v6.2 empty
v6.2 default
v6.2 archlinux
v6.2 fedora38

v6.6 empty
v6.6 default
v6.6 archlinux
v6.6 fedora38
File renamed without changes.

0 comments on commit 4c7c558

Please sign in to comment.