summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-11-01 13:39:16 -0400
committerMatthew Heon <matthew.heon@gmail.com>2017-11-01 13:39:16 -0400
commit7fa1efd0d75afcca835366779d593b282005bc5c (patch)
tree6f75cb2d969269b5dcc5ffa09ce05666630c763a
parentc13f61798aa7bcf7b4de7ee31aa30148a3b08d97 (diff)
downloadpodman-7fa1efd0d75afcca835366779d593b282005bc5c.tar.gz
podman-7fa1efd0d75afcca835366779d593b282005bc5c.tar.bz2
podman-7fa1efd0d75afcca835366779d593b282005bc5c.zip
Fix paths for tests
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
-rw-r--r--Makefile5
-rw-r--r--test/helpers.bash31
2 files changed, 8 insertions, 28 deletions
diff --git a/Makefile b/Makefile
index a70bdd959..39e0a8cda 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ endif
touch "$(GOPATH)/.gopathok"
.bindir:
- mkdir -p bin/
+ mkdir -p "$(GOPKGDIR)/bin/"
lint: .gopathok
@echo "checking lint"
@@ -157,10 +157,7 @@ install.completions:
install ${SELINUXOPT} -m 644 -D completions/bash/kpod ${BASHINSTALLDIR}
uninstall:
- rm -f $(BINDIR)/crio
- rm -f $(BINDIR)/crioctl
rm -f $(LIBEXECDIR)/crio/conmon
- rm -f $(LIBEXECDIR)/crio/pause
for i in $(filter %.1,$(MANPAGES)); do \
rm -f $(MANDIR)/man8/$$(basename $${i}); \
done
diff --git a/test/helpers.bash b/test/helpers.bash
index f98e376fb..428336268 100644
--- a/test/helpers.bash
+++ b/test/helpers.bash
@@ -9,11 +9,11 @@ TESTDATA="${INTEGRATION_ROOT}/testdata"
# Root directory of the repository.
CRIO_ROOT=${CRIO_ROOT:-$(cd "$INTEGRATION_ROOT/../.."; pwd -P)}
-KPOD_BINARY=${KPOD_BINARY:-${CRIO_ROOT}/cri-o/bin/kpod}
+KPOD_BINARY=${KPOD_BINARY:-${CRIO_ROOT}/libpod/bin/kpod}
# Path of the conmon binary.
-CONMON_BINARY=${CONMON_BINARY:-${CRIO_ROOT}/cri-o/bin/conmon}
+CONMON_BINARY=${CONMON_BINARY:-${CRIO_ROOT}/libpod/bin/conmon}
# Path of the default seccomp profile.
-SECCOMP_PROFILE=${SECCOMP_PROFILE:-${CRIO_ROOT}/cri-o/seccomp.json}
+SECCOMP_PROFILE=${SECCOMP_PROFILE:-${CRIO_ROOT}/libpod/seccomp.json}
# Name of the default apparmor profile.
APPARMOR_PROFILE=${APPARMOR_PROFILE:-crio-default}
# Runtime
@@ -33,13 +33,13 @@ BOOT_CONFIG_FILE_PATH=${BOOT_CONFIG_FILE_PATH:-/boot/config-`uname -r`}
# Path of apparmor parameters file.
APPARMOR_PARAMETERS_FILE_PATH=${APPARMOR_PARAMETERS_FILE_PATH:-/sys/module/apparmor/parameters/enabled}
# Path of the bin2img binary.
-BIN2IMG_BINARY=${BIN2IMG_BINARY:-${CRIO_ROOT}/cri-o/test/bin2img/bin2img}
+BIN2IMG_BINARY=${BIN2IMG_BINARY:-${CRIO_ROOT}/libpod/test/bin2img/bin2img}
# Path of the copyimg binary.
-COPYIMG_BINARY=${COPYIMG_BINARY:-${CRIO_ROOT}/cri-o/test/copyimg/copyimg}
+COPYIMG_BINARY=${COPYIMG_BINARY:-${CRIO_ROOT}/libpod/test/copyimg/copyimg}
# Path of tests artifacts.
-ARTIFACTS_PATH=${ARTIFACTS_PATH:-${CRIO_ROOT}/cri-o/.artifacts}
+ARTIFACTS_PATH=${ARTIFACTS_PATH:-${CRIO_ROOT}/libpod/.artifacts}
# Path of the checkseccomp binary.
-CHECKSECCOMP_BINARY=${CHECKSECCOMP_BINARY:-${CRIO_ROOT}/cri-o/test/checkseccomp/checkseccomp}
+CHECKSECCOMP_BINARY=${CHECKSECCOMP_BINARY:-${CRIO_ROOT}/libpod/test/checkseccomp/checkseccomp}
# XXX: This is hardcoded inside cri-o at the moment.
DEFAULT_LOG_PATH=/var/log/crio/pods
# Cgroup manager to be used
@@ -158,23 +158,6 @@ if ! [ -d "$ARTIFACTS_PATH"/image-volume-test-image ]; then
exit 1
fi
fi
-# Run crio using the binary specified by $CRIO_BINARY.
-# This must ONLY be run on engines created with `start_crio`.
-function crio() {
- "$CRIO_BINARY" --listen "$CRIO_SOCKET" "$@"
-}
-
-# DEPRECATED
-OCIC_BINARY=${OCIC_BINARY:-${CRIO_ROOT}/cri-o/bin/crioctl}
-# Run crioctl using the binary specified by $OCIC_BINARY.
-function crioctl() {
- "$OCIC_BINARY" --connect "$CRIO_SOCKET" "$@"
-}
-
-# Run crictl using the binary specified by $CRICTL_BINARY.
-function crictl() {
- "$CRICTL_BINARY" -r "$CRIO_SOCKET" -i "$CRIO_SOCKET" "$@"
-}
# Communicate with Docker on the host machine.
# Should rarely use this.