1 files changed, 21 insertions, 13 deletions
diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas
index 6ff564aaa..0b691dd0e 100755
--- a/test/buildah-bud/apply-podman-deltas
+++ b/test/buildah-bud/apply-podman-deltas
@@ -61,7 +61,12 @@ function _skip() {
     local skip=$1;   shift
     local reason=$1; shift
 
-    # All further arguments are test names
+    # All further arguments are test names. Make sure we're invoked with some!
+    if [[ -z "$*" ]]; then
+        echo "$ME: FATAL: Invalid use of '${FUNCNAME[1]}' at line ${BASH_LINENO[1]}: missing test-name argument(s)." >&2
+        exit 1
+    fi
+
     for t in "$@"; do
         if fgrep -qx "@test \"$t\" {" $BUD; then
             $ECHO "@test \"$t\" : $skip \"$reason\""
@@ -150,13 +155,7 @@ errmsg "checking authfile: stat /tmp/nonexistent: no such file or directory" \
 ###############################################################################
 # BEGIN tests that don't make sense under podman due to fundamental differences
 
-# TODO
-# Normally, when buildah exits 1 on error, podman exits 125.
-# These tests are the exception. They exit 1 under podman.
-skip "these tests exit 1 under podman, not 125" \
-     "bud with --add-host" \
-     "bud - invalid runtime flags test"
-
+# Fails with "Error: no context directory and no Containerfile specified"
 skip "does not work under podman" \
      "bud without any arguments should succeed"
 
@@ -167,8 +166,9 @@ skip "does not work under podman" \
 skip "FIXME FIXME FIXME: argument-order incompatible with podman" \
      "bud-squash-hardlinks"
 
-skip "FIXME FIXME FIXME: this passes on Ed's laptop, fails in CI??" \
-     "bud-multi-stage-nocache-nocommit"
+# Fails with "Error: context must be a directory: /path/to/Dockerfile"
+skip "podman-build fails with 'context must be a directory'" \
+     "bud with specified context should succeed if context contains existing Dockerfile"
 
 ###############################################################################
 # BEGIN tests which are skipped because they make no sense under podman-remote
@@ -217,6 +217,12 @@ skip_if_remote "--output option not implemented in podman-remote" \
                "build with custom build output and output rootfs to tar by pipe" \
                "build with custom build output must fail for bad input"
 
+# https://github.com/containers/podman/issues/14544
+skip_if_remote "logfile not implemented on remote" "bud-logfile-with-split-logfile-by-platform"
+
+skip_if_remote "envariables do not automatically work with -remote." \
+               "build proxy"
+
 ###############################################################################
 # BEGIN tests which are skipped due to actual podman or podman-remote bugs.
 
@@ -229,10 +235,12 @@ skip_if_remote "FIXME FIXME FIXME: find a way to clean up their podman calls" \
                "bud with run should not leave mounts behind cleanup test" \
                "bud with custom files in /run/ should persist cleanup test"
 
-skip_if_remote "Do envariables work with -remote? Please look into this." \
-               "build proxy"
+# Under podman-remote, the "Ignoring <stdin>:5:2: error: #error" message
+# is never seen. (Not even as stdout/stderr on the server; Ed checked).
+skip_if_remote "FIXME FIXME FIXME: 'Ignoring' warning is never seen" \
+               "bud with preprocessor error"
 
+# END   tests which are skipped due to actual podman or podman-remote bugs.
 ###############################################################################
-# Done.
 
 exit $RC