From 8bae095fd744495a5ab0557a1224afc15843144d Mon Sep 17 00:00:00 2001
From: Michal Cichra <michal@cichra.cz>
Date: Tue, 12 Dec 2017 11:43:31 +0100
Subject: [PATCH] use cpanminus

---
 .circleci/config.yml | 2 +-
 Makefile             | 3 ++-
 gateway/Makefile.PL  | 7 -------
 gateway/cpanfile     | 2 ++
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100644 gateway/Makefile.PL
 create mode 100644 gateway/cpanfile

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 099d56070..c974c8083 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,7 @@ jobs:
       - run: mkdir -p tmp/junit
       - run: $(make rover) exec make busted
       - run:
-          command: make prove
+          command: /usr/libexec/s2i/entrypoint make prove
           environment:
             JUNIT_OUTPUT_FILE: tmp/junit/prove.xml
             HARNESS: TAP::Harness::JUnit
diff --git a/Makefile b/Makefile
index a1e401718..1ce336182 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,8 @@ nginx:
 prove: HARNESS ?= TAP::Harness
 prove: export TEST_NGINX_RANDOMIZE=1
 prove: $(ROVER) nginx ## Test nginx
-	(cd gateway && PERL_AUTOINSTALL_PREFER_CPAN=1 PERL_AUTOINSTALL=--checkdeps perl Makefile.PL)
+	env
+	cpanm --installdeps ./gateway
 	$(ROVER) exec prove -j$(NPROC) --harness=$(HARNESS) 2>&1 | awk '/found ONLY/ { print "FAIL: because found ONLY in test"; print; exit 1 }; { print }'
 
 prove-docker: apicast-source
diff --git a/gateway/Makefile.PL b/gateway/Makefile.PL
deleted file mode 100644
index ccdebc3c5..000000000
--- a/gateway/Makefile.PL
+++ /dev/null
@@ -1,7 +0,0 @@
-use inc::Module::Install;
-
-requires 'Test::APIcast', '0.03';
-
-install_as_vendor();
-installdeps_target();
-auto_install_now();
diff --git a/gateway/cpanfile b/gateway/cpanfile
new file mode 100644
index 000000000..87f1e3ed1
--- /dev/null
+++ b/gateway/cpanfile
@@ -0,0 +1,2 @@
+requires 'Test::APIcast', '0.03';
+requires 'JSON::WebToken';