Skip to content

Commit dffd7e2

Browse files
committed
Fixing github tests on macos
1 parent 11af447 commit dffd7e2

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
SHELL := bash
22
INSTALL ?= install
3+
UNAME := $(shell uname);
4+
REALPATH := $(shell if [ $(UNAME) == "Darwin" ]; then echo grealpath; else echo realpath; fi)
35

46
# Make sure we have git:
57
ifeq ($(shell which git),)
@@ -22,7 +24,7 @@ INSTALL_BIN ?= $(PREFIX)/bin
2224
INSTALL_LIB ?= $(PREFIX)/share/$(NAME)
2325
INSTALL_EXT ?= $(INSTALL_LIB)/$(NAME).d
2426
INSTALL_MAN1 ?= $(PREFIX)/share/man/man1
25-
LINK_REL_DIR := $(shell realpath --relative-to=$(INSTALL_BIN) $(INSTALL_LIB))
27+
LINK_REL_DIR := $(shell $(REALPATH) --relative-to=$(INSTALL_BIN) $(INSTALL_LIB))
2628

2729
# Docker variables:
2830
DOCKER_TAG ?= 0.0.6
@@ -49,6 +51,7 @@ help:
4951

5052
.PHONY: test
5153
test:
54+
@echo UNAME: '$(UNAME)'
5255
prove $(prove) $(test)
5356

5457
test-all: test docker-tests

test/setup

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
set -e
44

5-
export LC_ALL=C.UTF-8
5+
if [ "$(uname)" == "Linux" ]; then
6+
export LC_ALL=C.UTF-8
7+
fi
68

79
# Get the location of this script
810
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )

0 commit comments

Comments
 (0)