Skip to content

Commit 5d2b3a7

Browse files
committed
Meta: Update makem.sh, Makefile, and pre-push
Use local .sandbox sandbox. (Assumes it is initialized.)
1 parent 035c20f commit 5d2b3a7

File tree

3 files changed

+311
-76
lines changed

3 files changed

+311
-76
lines changed

Makefile

+10-6
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ ifdef install-linters
1919
endif
2020

2121
ifdef sandbox
22-
SANDBOX = "--sandbox"
23-
endif
24-
25-
ifdef sandbox-dir
26-
SANDBOX_DIR = "--sandbox-dir" "$(sandbox-dir)"
22+
ifeq ($(sandbox), t)
23+
SANDBOX = --sandbox
24+
else
25+
SANDBOX = --sandbox $(sandbox)
26+
endif
2727
endif
2828

2929
ifdef debug
@@ -49,4 +49,8 @@ endif
4949
# directory by that name exists, which can confuse Make.
5050

5151
%:
52-
@./makem.sh $(DEBUG) $(VERBOSE) $(SANDBOX) $(SANDBOX_DIR) $(INSTALL_DEPS) $(INSTALL_LINTERS) $(@)
52+
@./makem.sh $(DEBUG) $(VERBOSE) $(SANDBOX) $(INSTALL_DEPS) $(INSTALL_LINTERS) $(@)
53+
54+
.DEFAULT: init
55+
init:
56+
@./makem.sh $(DEBUG) $(VERBOSE) $(SANDBOX) $(INSTALL_DEPS) $(INSTALL_LINTERS)

hooks/pre-push

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ read local_ref local_sha remote_ref remote_sha
1414
# cause remote code to be downloaded and executed (i.e. what would
1515
# happen by installing packages). It can be done manually when needed.
1616

17-
make test
17+
make sandbox=.sandbox test

0 commit comments

Comments
 (0)