From 718d7e7a51fbf82e729045f4293eca56766abff4 Mon Sep 17 00:00:00 2001
From: Eduardo Rafael <theeduardorfs@gmail.com>
Date: Sat, 12 Jun 2021 12:41:32 -0300
Subject: [PATCH] Improve local tests-e2e-re (#1070)

* Fix: Support local installation of node

* Tests: Add test-e2e-re to `make test`
---
 Makefile | 8 ++++++++
 esy.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 01a29b1b0..8f94c98cf 100644
--- a/Makefile
+++ b/Makefile
@@ -166,6 +166,12 @@ test-unit::
 test-e2e:: ./bin/esy
 	@./node_modules/.bin/jest test-e2e
 
+verdaccio::
+	cd test-e2e-re/lib/verdaccio && npm install
+
+test-e2e-re:: ./bin/esy verdaccio
+	esy test:e2e-re
+
 test-e2e-slow:: ./bin/esy
 	@./node_modules/.bin/jest test-e2e-slow
 
@@ -174,6 +180,8 @@ test::
 	@$(MAKE) test-unit
 	@echo "Running test suite: e2e"
 	@$(MAKE) test-e2e
+	@echo "Running test suite: e2e-re"
+	@$(MAKE) test-e2e-re
 
 ci::
 	@$(MAKE) test
diff --git a/esy.json b/esy.json
index c0fa547ef..2145e16d9 100644
--- a/esy.json
+++ b/esy.json
@@ -28,7 +28,7 @@
     "release:platform-release": "node ./scripts/make-platform-release.js",
     "test:unit": "esy b dune runtest",
     "test:e2e": "npm run jest test-e2e",
-    "test:e2e-re": "esy b dune exec ./test-e2e-re/lib/RunTests.exe",
+    "test:e2e-re": "sh -c 'esy b; esy dune exec ./test-e2e-re/lib/RunTests.exe'",
     "test:e2e-slow": "node test-e2e-slow/run-slow-tests.js"
   },
   "resolutions": {