From 9ac631e686635ffc17cb1fb45027b8a67f125c80 Mon Sep 17 00:00:00 2001
From: Harmen <alicebob@lijzij.de>
Date: Sat, 23 Mar 2024 09:38:18 +0100
Subject: [PATCH] #362 again (#364)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Make improvements
---------

Signed-off-by: Wojciech Szarański <wojciech.szaranski@gmail.com>
Co-authored-by: Wojciech Szarański <wojciech.szaranski@gmail.com>
---
 .github/workflows/ci.yaml      |  4 +---
 Makefile                       | 26 +++++++++++++++++++++-----
 integration/Makefile           | 16 +++++++++++-----
 integration/get_redis.sh       |  1 +
 integration/sorted_set_test.go |  2 ++
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 247b063c..f427fecf 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,7 +16,5 @@ jobs:
     - uses: actions/setup-go@v4
       with:
         go-version: ${{ matrix.go }}
-    - name: Install Redis
-      run: (cd ./integration && ./get_redis.sh)
     - name: Test
-      run: make int testrace
+      run: make ci
diff --git a/Makefile b/Makefile
index 125f574c..b29f2011 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,4 @@
-.PHONY: all test testrace int
-
-all: test
-
+.PHONY: test testrace int ci clean help
 test:
 	go test ./...
 
@@ -9,4 +6,23 @@ testrace:
 	go test -race ./...
 
 int:
-	INT=1 go test ./...
+	${MAKE} -C integration int
+
+ci:
+	${MAKE} test
+	${MAKE} -C integration redis_src/redis-server int
+	${MAKE} testrace
+
+clean:
+	${MAKE} -C integration clean
+
+help:
+ifeq ($(UNAME), Linux)
+	@grep -P '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | \
+		awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
+else
+	@# this is not tested, but prepared in advance for you, Mac drivers
+	@awk -F ':.*###' '$$0 ~ FS {printf "%15s%s\n", $$1 ":", $$2}' \
+		$(MAKEFILE_LIST) | grep -v '@awk' | sort
+endif
+
diff --git a/integration/Makefile b/integration/Makefile
index e49620be..5463b5b7 100644
--- a/integration/Makefile
+++ b/integration/Makefile
@@ -1,7 +1,13 @@
-.PHONY: all test
+.PHONY: int
+int:
+	INT=1 go test
 
-all: test
+redis_src/redis-server: get_redis.sh
+	./get_redis.sh
 
-test:
-	rm -f ./dump.rdb ./nodes.conf
-	INT=1 go test
+.PHONY: clean
+clean:
+	rm -rf \
+		redis_src \
+		dump.rdb \
+		nodes.conf
diff --git a/integration/get_redis.sh b/integration/get_redis.sh
index 21b79eaf..3a6e5d4c 100755
--- a/integration/get_redis.sh
+++ b/integration/get_redis.sh
@@ -4,6 +4,7 @@ set -eu
 
 VERSION=7.2.4
 
+cd "$(dirname "$0")"
 rm -rf ./redis_src/
 mkdir -p ./redis_src/
 cd ./redis_src/
diff --git a/integration/sorted_set_test.go b/integration/sorted_set_test.go
index a9ce2110..60cc9c1d 100644
--- a/integration/sorted_set_test.go
+++ b/integration/sorted_set_test.go
@@ -636,6 +636,7 @@ func TestSortedSetIncyby(t *testing.T) {
 }
 
 func TestZscan(t *testing.T) {
+	skip(t)
 	testRaw(t, func(c *client) {
 		// No set yet
 		c.Do("ZSCAN", "h", "0")
@@ -945,6 +946,7 @@ func TestZrandmember(t *testing.T) {
 }
 
 func TestZMScore(t *testing.T) {
+	skip(t)
 	testRaw(t, func(c *client) {
 		c.Do("ZADD", "q", "1.0", "key1")
 		c.Do("ZADD", "q", "2.0", "key2")