diff --git a/test/cases/000_build/020_binds/test.sh b/test/cases/000_build/020_binds/test.sh index cb84fe5cf..0ecd35163 100755 --- a/test/cases/000_build/020_binds/test.sh +++ b/test/cases/000_build/020_binds/test.sh @@ -20,7 +20,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=32M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=32M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/000_build/070_volumes/000_rw_on_rw/test.sh b/test/cases/000_build/070_volumes/000_rw_on_rw/test.sh index 8605832d3..0525559e9 100755 --- a/test/cases/000_build/070_volumes/000_rw_on_rw/test.sh +++ b/test/cases/000_build/070_volumes/000_rw_on_rw/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/000_build/070_volumes/001_ro_on_ro/test.sh b/test/cases/000_build/070_volumes/001_ro_on_ro/test.sh index 8fbb4c99b..210aee0de 100755 --- a/test/cases/000_build/070_volumes/001_ro_on_ro/test.sh +++ b/test/cases/000_build/070_volumes/001_ro_on_ro/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/000_build/070_volumes/003_ro_on_rw/test.sh b/test/cases/000_build/070_volumes/003_ro_on_rw/test.sh index a1a5bd856..b40af5bf6 100755 --- a/test/cases/000_build/070_volumes/003_ro_on_rw/test.sh +++ b/test/cases/000_build/070_volumes/003_ro_on_rw/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/000_build/070_volumes/004_blank/test.sh b/test/cases/000_build/070_volumes/004_blank/test.sh index 1f070b3e1..00bc34417 100755 --- a/test/cases/000_build/070_volumes/004_blank/test.sh +++ b/test/cases/000_build/070_volumes/004_blank/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/000_build/070_volumes/005_image/test.sh b/test/cases/000_build/070_volumes/005_image/test.sh index 099dc33be..872202d3a 100755 --- a/test/cases/000_build/070_volumes/005_image/test.sh +++ b/test/cases/000_build/070_volumes/005_image/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/000_build/070_volumes/006_mount_types/test.sh b/test/cases/000_build/070_volumes/006_mount_types/test.sh index 7bc5c5f34..d1108fd84 100755 --- a/test/cases/000_build/070_volumes/006_mount_types/test.sh +++ b/test/cases/000_build/070_volumes/006_mount_types/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/020_kernel/011_config_5.4.x/test.sh b/test/cases/020_kernel/011_config_5.4.x/test.sh index 058d0806e..829ec8948 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.sh +++ b/test/cases/020_kernel/011_config_5.4.x/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/013_config_5.10.x/test.sh b/test/cases/020_kernel/013_config_5.10.x/test.sh index 058d0806e..829ec8948 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.sh +++ b/test/cases/020_kernel/013_config_5.10.x/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/016_config_5.15.x/test.sh b/test/cases/020_kernel/016_config_5.15.x/test.sh index 058d0806e..829ec8948 100644 --- a/test/cases/020_kernel/016_config_5.15.x/test.sh +++ b/test/cases/020_kernel/016_config_5.15.x/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/019_config_6.6.x/test.sh b/test/cases/020_kernel/019_config_6.6.x/test.sh index 058d0806e..829ec8948 100644 --- a/test/cases/020_kernel/019_config_6.6.x/test.sh +++ b/test/cases/020_kernel/019_config_6.6.x/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.sh b/test/cases/020_kernel/111_kmod_5.4.x/test.sh index cbdbd7fc8..ac1dd5acc 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.sh +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.sh @@ -25,7 +25,7 @@ docker build -t ${IMAGE_NAME} . # Build and run a LinuxKit image with kernel module (and test script) linuxkit build --docker --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "Hello LinuxKit" exit 0 diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.sh b/test/cases/020_kernel/113_kmod_5.10.x/test.sh index 50c26de33..4c300b1f0 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.sh +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.sh @@ -25,7 +25,7 @@ docker build -t ${IMAGE_NAME} . # Build and run a LinuxKit image with kernel module (and test script) linuxkit build --docker --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "Hello LinuxKit" exit 0 diff --git a/test/cases/020_kernel/116_kmod_5.15.x/test.sh b/test/cases/020_kernel/116_kmod_5.15.x/test.sh index 0d45077a5..11245d224 100644 --- a/test/cases/020_kernel/116_kmod_5.15.x/test.sh +++ b/test/cases/020_kernel/116_kmod_5.15.x/test.sh @@ -25,7 +25,7 @@ docker build -t ${IMAGE_NAME} . # Build and run a LinuxKit image with kernel module (and test script) linuxkit build --docker --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "Hello LinuxKit" exit 0 diff --git a/test/cases/020_kernel/119_kmod_6.6.x/test.sh b/test/cases/020_kernel/119_kmod_6.6.x/test.sh index f1995daf8..ef3ea8d32 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/test.sh +++ b/test/cases/020_kernel/119_kmod_6.6.x/test.sh @@ -25,7 +25,7 @@ docker build -t ${IMAGE_NAME} . # Build and run a LinuxKit image with kernel module (and test script) linuxkit build --docker --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" | grep -q "Hello LinuxKit" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh index 01aefb510..b468c7007 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh index d341eb9d1..9de191430 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh index 4eab339d3..a3e2fa417 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh index a8898141e..fefd53ffc 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh index 78c01d3ed..df143ec74 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh index 3b32a2d2e..1383cd251 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh index 9a0679936..2afdd37ee 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh index 993c12d77..9f9350fca 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh index 77894b0af..8bf890bf8 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh index 53b7a0b6a..38452b141 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh index 2a6620aec..73e140359 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh index f13b3a7ec..ef0555515 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh index 43e40eeae..e2dcb61a9 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh index 55e36f11a..dcb6cd1b6 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh index 9518649ad..9a3834eda 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh index 99fdf84a8..99b3bdd73 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh index b09b58908..df5d182d7 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh index e70be14e4..fcede8993 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh index 9e1133449..aef4b25c6 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh index 17c0d0b52..d24a1bdc8 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh index 3f3d90b1b..4645eaddb 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh index cd23af39b..c1065ed4c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh index 2a96c5f21..cdc66555c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh index 7fd0f1dad..1b9aeae6d 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh index ed192dfc4..0f8fb5b6a 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh index 7be132aaa..a75fabba7 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh index 3245d3dd8..189d46f11 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh index 02e9c5c2d..cacd1e0d5 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh index 5f26c6c04..e001bf0c4 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh index daf4797c2..f284125e8 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh index 73ec3fb79..cc5640931 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh index fb3b815ad..c3a4f991c 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh index aa2efc44f..900a1fa29 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh index 132cbb714..74811f0ac 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh index 3985edc4d..5e630408e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh index 469dae0c2..808c5709e 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh index 6164db865..7849e59cf 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh index 904404f70..d7e8bf28f 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh index cb161db10..b3a801efe 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh index 6c740db90..ae16d0cc8 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh index da48e432b..d5c1458a2 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh index b3c2931e9..787cccaac 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh index fe8b1f2a4..7ee648fc3 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh index 752f71129..076655ebc 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh index 91dff3fd9..93109e4be 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh index 257fbdb15..9d28dcb06 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh index 83aef2ae1..232507f74 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh index f1866871a..382bca3df 100644 --- a/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.sh index 790fe3436..789b7e044 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.sh index 4e0275084..152abe55c 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/010_echo-short-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.sh index 0fe9bb17c..d45d657aa 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.sh index dd42c4e54..cfc9c7a27 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/011_echo-short-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh index 59f9f24f7..629d588ee 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.sh index 3c1936b07..4e92ab914 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/012_echo-short-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.sh index e8c7c25c7..16a38bfd9 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.sh index 91dd18e67..d0e95d4c5 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/015_echo-long-1con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.sh index 9beda1765..d1df049c4 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.sh index caec7fd72..e4b8217c0 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/016_echo-long-10con-single/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh index 402a91f2c..b5c468fae 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.sh b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.sh index b8ebeb47a..8e4824e5b 100644 --- a/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.sh +++ b/test/cases/020_kernel/200_namespace/050_unix-domain/017_echo-long-5con-multi/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.sh b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.sh index b2d1e6f27..e6c930c2a 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.sh +++ b/test/cases/020_kernel/200_namespace/100_mix/010_veth-unix-domain-echo/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.sh b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.sh index 677996114..4e712eeb9 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.sh +++ b/test/cases/020_kernel/200_namespace/100_mix/011_veth-unix-domain-echo-reverse/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.sh b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.sh index c40fbec80..f156c32e2 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.sh +++ b/test/cases/020_kernel/200_namespace/100_mix/012_veth-ipv4-echo/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.sh b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.sh index 4c370986c..c66531695 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.sh +++ b/test/cases/020_kernel/200_namespace/100_mix/013_veth-ipv6-echo/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.sh b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.sh index 0328c7f2b..ef1e7ba3c 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.sh +++ b/test/cases/020_kernel/200_namespace/100_mix/014_veth-tcp-echo/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.sh b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.sh index 9edd3c1c5..2f3ce7190 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.sh +++ b/test/cases/020_kernel/200_namespace/100_mix/015_veth-udp-echo/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.sh b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.sh index 21eb903a6..eea154d5b 100644 --- a/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.sh +++ b/test/cases/020_kernel/200_namespace/100_mix/020_unix-domain-echo/test.sh @@ -17,7 +17,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} ../../common.yml test.yml -RESULT="$(linuxkit run -cpus 2 ${NAME})" +RESULT="$(linuxkitrun -cpus 2 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/030_security/010_ports/test.sh b/test/cases/030_security/010_ports/test.sh index e517e0f6a..ebd8d2dd7 100644 --- a/test/cases/030_security/010_ports/test.sh +++ b/test/cases/030_security/010_ports/test.sh @@ -19,6 +19,6 @@ trap clean_up EXIT linuxkit build --format kernel+initrd --name "${NAME}" test.yml linuxkit run qemu --kernel "${NAME}" -#RESULT=$(linuxkit run qemu --kernel "${NAME}") +#RESULT=$(linuxkitrun qemu --kernel "${NAME}") #echo "${RESULT}" | grep -q "PASSED" exit 0 diff --git a/test/cases/040_packages/002_bcc/test.sh b/test/cases/040_packages/002_bcc/test.sh index e1169c78e..4f4f3b027 100644 --- a/test/cases/040_packages/002_bcc/test.sh +++ b/test/cases/040_packages/002_bcc/test.sh @@ -17,7 +17,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/002_binfmt/test.sh b/test/cases/040_packages/002_binfmt/test.sh index bc970491e..542790590 100644 --- a/test/cases/040_packages/002_binfmt/test.sh +++ b/test/cases/040_packages/002_binfmt/test.sh @@ -17,7 +17,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/002_bpftrace/test.sh b/test/cases/040_packages/002_bpftrace/test.sh index 115bd123b..51caa085b 100644 --- a/test/cases/040_packages/002_bpftrace/test.sh +++ b/test/cases/040_packages/002_bpftrace/test.sh @@ -17,7 +17,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/003_ca-certificates/test.sh b/test/cases/040_packages/003_ca-certificates/test.sh index d45699803..974328d1c 100644 --- a/test/cases/040_packages/003_ca-certificates/test.sh +++ b/test/cases/040_packages/003_ca-certificates/test.sh @@ -17,7 +17,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run $NAME)" +RESULT="$(linuxkitrun $NAME)" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/003_cgroupv2/test.sh b/test/cases/040_packages/003_cgroupv2/test.sh index 99f07a52c..490444088 100644 --- a/test/cases/040_packages/003_cgroupv2/test.sh +++ b/test/cases/040_packages/003_cgroupv2/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run --mem 3072 ${NAME})" +RESULT="$(linuxkitrun --mem 3072 ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/040_packages/003_containerd/test.sh b/test/cases/040_packages/003_containerd/test.sh index e4a34e688..a671ceaa3 100644 --- a/test/cases/040_packages/003_containerd/test.sh +++ b/test/cases/040_packages/003_containerd/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run --mem 3072 --disk size=2G ${NAME})" +RESULT="$(linuxkitrun --mem 3072 --disk size=2G ${NAME})" echo "${RESULT}" | grep -q "suite PASSED" exit 0 diff --git a/test/cases/040_packages/004_dhcpcd/test.sh b/test/cases/040_packages/004_dhcpcd/test.sh index e76ebb88b..e20b7ab34 100644 --- a/test/cases/040_packages/004_dhcpcd/test.sh +++ b/test/cases/040_packages/004_dhcpcd/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run $NAME)" +RESULT="$(linuxkitrun $NAME)" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.sh b/test/cases/040_packages/004_dm-crypt/000_simple/test.sh index d10def584..d5660fafa 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.sh +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=32M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=32M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.sh b/test/cases/040_packages/004_dm-crypt/001_luks/test.sh index 5bd66caac..f98893cf4 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.sh +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=20M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=20M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.sh b/test/cases/040_packages/004_dm-crypt/002_key/test.sh index d10def584..d5660fafa 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.sh +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=32M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=32M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/005_extend/000_ext4/test.sh b/test/cases/040_packages/005_extend/000_ext4/test.sh index 657dc8a16..e43568271 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.sh +++ b/test/cases/040_packages/005_extend/000_ext4/test.sh @@ -25,7 +25,7 @@ linuxkit run --disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}" # osx takes issue with bs=1M dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" linuxkit build --format kernel+initrd --name ${NAME_EXTEND} test.yml -RESULT="$(linuxkit run --disk file=${DISK} ${NAME_EXTEND})" +RESULT="$(linuxkitrun --disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.sh b/test/cases/040_packages/005_extend/001_btrfs/test.sh index 916c8a0f8..af2de2358 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.sh +++ b/test/cases/040_packages/005_extend/001_btrfs/test.sh @@ -25,7 +25,7 @@ linuxkit run --disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}" # osx takes issue with bs=1M dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" linuxkit build --format kernel+initrd --name ${NAME_EXTEND} test.yml -RESULT="$(linuxkit run --disk file=${DISK} ${NAME_EXTEND})" +RESULT="$(linuxkitrun --disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/005_extend/002_xfs/test.sh b/test/cases/040_packages/005_extend/002_xfs/test.sh index 5ba63d50b..56519024d 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.sh +++ b/test/cases/040_packages/005_extend/002_xfs/test.sh @@ -25,7 +25,7 @@ linuxkit run --disk file="${DISK}",format=raw,size=512M "${NAME_CREATE}" # osx takes issue with bs=1M dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" linuxkit build --name "${NAME_EXTEND}" --format kernel+initrd test.yml -RESULT="$(linuxkit run --disk file=${DISK} ${NAME_EXTEND})" +RESULT="$(linuxkitrun --disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/005_extend/003_gpt/test.sh b/test/cases/040_packages/005_extend/003_gpt/test.sh index e2557f5b7..689f421b6 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.sh +++ b/test/cases/040_packages/005_extend/003_gpt/test.sh @@ -25,7 +25,7 @@ linuxkit run --disk file="${DISK}",format=raw,size=256M "${NAME_CREATE}" # osx takes issue with bs=1M dd if=/dev/zero bs=1048576 count=256 >> "${DISK}" linuxkit build --format kernel+initrd --name ${NAME_EXTEND} test.yml -RESULT="$(linuxkit run --disk file=${DISK} ${NAME_EXTEND})" +RESULT="$(linuxkitrun --disk file=${DISK} ${NAME_EXTEND})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.sh b/test/cases/040_packages/006_format_mount/000_auto/test.sh index 63338b5c8..621547282 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.sh +++ b/test/cases/040_packages/006_format_mount/000_auto/test.sh @@ -18,7 +18,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.sh b/test/cases/040_packages/006_format_mount/001_by_label/test.sh index cd44777ae..f0cc7be26 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.sh +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.sh @@ -18,7 +18,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.sh b/test/cases/040_packages/006_format_mount/002_by_name/test.sh index fa4749015..68fd4a978 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.sh +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.sh @@ -26,7 +26,7 @@ fi sed -e "s,@DEVICE@,${DEVICE},g" test.yml.in > test.yml linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh index dc0883665..d591d02e3 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.sh +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.sh @@ -19,7 +19,7 @@ trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.sh b/test/cases/040_packages/006_format_mount/004_xfs/test.sh index 81c46ce55..37bb79fa0 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.sh +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.sh @@ -18,7 +18,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh b/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh index 018acf33c..320517014 100755 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh @@ -20,7 +20,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK1},size=512M --disk file=${DISK2},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK1},size=512M --disk file=${DISK2},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.sh b/test/cases/040_packages/006_format_mount/006_gpt/test.sh index 02406c6e4..6f47e7ea3 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.sh +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.sh @@ -18,7 +18,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.sh b/test/cases/040_packages/006_format_mount/010_multiple/test.sh index c9d1cb348..a6f0fb533 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.sh +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK1},size=512M --disk file=${DISK2},size=512M ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK1},size=512M --disk file=${DISK2},size=512M ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/009_init_containerd/test.sh b/test/cases/040_packages/009_init_containerd/test.sh index 987f20e5c..b2341b382 100644 --- a/test/cases/040_packages/009_init_containerd/test.sh +++ b/test/cases/040_packages/009_init_containerd/test.sh @@ -17,7 +17,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run $NAME)" +RESULT="$(linuxkitrun $NAME)" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/011_kmsg/test.sh b/test/cases/040_packages/011_kmsg/test.sh index 04471edd0..fc57df979 100644 --- a/test/cases/040_packages/011_kmsg/test.sh +++ b/test/cases/040_packages/011_kmsg/test.sh @@ -17,7 +17,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/012_logwrite/test.sh b/test/cases/040_packages/012_logwrite/test.sh index 7b2126819..bab4c286d 100644 --- a/test/cases/040_packages/012_logwrite/test.sh +++ b/test/cases/040_packages/012_logwrite/test.sh @@ -17,7 +17,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/012_losetup/test.sh b/test/cases/040_packages/012_losetup/test.sh index 9b0b5a9a2..b100b069b 100644 --- a/test/cases/040_packages/012_losetup/test.sh +++ b/test/cases/040_packages/012_losetup/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run $NAME)" +RESULT="$(linuxkitrun $NAME)" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/013_metadata/000_cidata/test.sh b/test/cases/040_packages/013_metadata/000_cidata/test.sh index 36c0ec363..c204d99a7 100755 --- a/test/cases/040_packages/013_metadata/000_cidata/test.sh +++ b/test/cases/040_packages/013_metadata/000_cidata/test.sh @@ -25,7 +25,7 @@ ISOFILE=/tmp/cidata.iso docker run -i --rm -v $(pwd)/geniso.sh:/geniso.sh:ro alpine:3.13 /geniso.sh > ${ISOFILE} linuxkit build --format kernel+initrd --name ${NAME} test.yml -RESULT="$(linuxkit run --disk file=${DISK},size=32M --disk file=${ISOFILE} ${NAME})" +RESULT="$(linuxkitrun --disk file=${DISK},size=32M --disk file=${ISOFILE} ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/019_sysctl/test.sh b/test/cases/040_packages/019_sysctl/test.sh index 7bee0bf81..96278d489 100644 --- a/test/cases/040_packages/019_sysctl/test.sh +++ b/test/cases/040_packages/019_sysctl/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/040_packages/023_wireguard/test.sh b/test/cases/040_packages/023_wireguard/test.sh index d3fb512d4..abe1724bf 100644 --- a/test/cases/040_packages/023_wireguard/test.sh +++ b/test/cases/040_packages/023_wireguard/test.sh @@ -18,7 +18,7 @@ trap clean_up EXIT # Test code goes here linuxkit build --format kernel+initrd --name "${NAME}" test.yml -RESULT="$(linuxkit run ${NAME})" +RESULT="$(linuxkitrun ${NAME})" echo "${RESULT}" echo "${RESULT}" | grep -q "suite PASSED" diff --git a/test/cases/_lib/lib.sh b/test/cases/_lib/lib.sh index cf9c34757..dee417885 100644 --- a/test/cases/_lib/lib.sh +++ b/test/cases/_lib/lib.sh @@ -12,3 +12,8 @@ LINUXKIT_TMPDIR="${RT_PROJECT_ROOT}/_tmp" # FIXME: Should source the rtf/lib/lib.sh instead RT_CANCEL=253 + +# command to run `linuxkit run` that includes streaming to stderr, so you never miss logs +linuxkitrun() { + linuxkit run $@ | tee /dev/stderr +}