Merge pull request #7403 from QiWang19/runtime-flag

Add global options --runtime-flags

2 files changed, 24 insertions, 1 deletions

diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 4e518c571..518d902a7 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -61,6 +61,12 @@ echo $rand        |   0 | $rand
     is "$tests_run" "$(grep . <<<$tests | wc -l)" "Ran the full set of tests"
 }
 
+@test "podman run - globle runtime option" {
+    skip_if_remote "runtime flag is not passing over remote"
+    run_podman 126 --runtime-flag invalidflag run --rm $IMAGE
+    is "$output" ".*invalidflag" "failed when passing undefined flags to the runtime"
+}
+
 # 'run --preserve-fds' passes a number of additional file descriptors into the container
 @test "podman run --preserve-fds" {
     skip_if_remote "preserve-fds is meaningless over remote"
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 997699ecb..1d757bbc7 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -30,9 +30,26 @@ EOF
     run_podman rmi -f build_test
 }
 
+@test "podman build - global runtime flags test" {
+    skip_if_remote "FIXME: pending #7136"
+
+    rand_content=$(random_string 50)
+
+    tmpdir=$PODMAN_TMPDIR/build-test
+    run mkdir -p $tmpdir
+    containerfile=$tmpdir/Containerfile
+    cat >$containerfile <<EOF
+FROM $IMAGE
+RUN echo $rand_content
+EOF
+
+    run_podman 125 --runtime-flag invalidflag build -t build_test $tmpdir
+    is "$output" ".*invalidflag" "failed when passing undefined flags to the runtime"
+}
+
 # Regression from v1.5.0. This test passes fine in v1.5.0, fails in 1.6
 @test "podman build - cache (#3920)" {
-    skip_if_remote "FIXME: pending #7136"
+    skip_if_remote "FIXME: pending #7136, runtime flag is not passing over remote"
     if is_remote && is_rootless; then
         skip "unreliable with podman-remote and rootless; #2972"
     fi