fixes 4

Author: rafie

.circleci/config.yml

@@ -24,7 +24,7 @@ commands:
       - save_cache:
           paths:
             - deps
-          key: v1-dependencies-{{ checksum "get_deps.sh" }}
+          key: build-dependencies-{{ checksum "get_deps.sh" }}
       - run:
           name: Set up workspace
           command: |
@@ -68,6 +68,36 @@ jobs:
     steps:
       - ci_steps:
           platform: debian
+
+  coverage:
+    docker:
+      - image: redislabsmodules/rmbuilder:latest
+    steps:
+      - checkout
+      - run:
+          name: Install dependencies
+          command: |
+            ./opt/readies/bin/getpy3
+            BREW_NO_UPDATE=1 ./opt/system-setup.py
+            git clone git://github.com/antirez/redis.git --branch 5.0.7
+            (cd redis && make malloc=libc -j $(nproc) && make install)
+            redis-server --version
+      - restore_cache:
+          keys:
+          - build-dependencies-{{ checksum "get_deps.sh" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+      - run:
+          name: Build
+          command: |
+			# make fetch SHOW=1
+		    make -C opt build COV=1 SHOW=1
+      - run:
+          name: Test with coverage
+          command: |
+            make -C opt test SHOW=1 COV=1
+			make cov-upload COV=1
+
   build-macos:
     macos:
       xcode: 10.2.1
@@ -78,6 +108,7 @@ jobs:
             brew reinstall -f python2
       - ci_steps:
           platform: macosx
+
   build-multiarch-docker:
     machine:
       enabled: true
@@ -102,6 +133,7 @@ jobs:
             sudo docker login -u redisfab -p $DOCKER_REDISFAB_PWD
             make -C opt/build/docker build
             sudo make -C opt/build/docker publish
+
   build-gpu:
     machine:
       enabled: true
@@ -129,6 +161,7 @@ jobs:
           no_output_timeout: 30m
       - store_test_results:
           path: ~/workspace/tests
+
   deploy_package:
     parameters:
       package:
@@ -164,6 +197,14 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - coverage:
+          requires:
+            - build
+          filters:
+            branches:
+              only: /.*/
+            tags:
+              only: /.*/ 
       - build-macos:
           filters:
             branches:

README.md

@@ -3,6 +3,7 @@
 [![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/redisai/redisai.svg)](https://hub.docker.com/r/redisai/redisai/builds/)
 [![Mailing List](https://img.shields.io/badge/Mailing%20List-RedisAI-blue)](https://groups.google.com/forum/#!forum/redisai)
 [![Gitter](https://badges.gitter.im/RedisLabs/RedisAI.svg)](https://gitter.im/RedisLabs/RedisAI?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![codecov](https://codecov.io/gh/RedisAI/RedisAI/branch/master/graph/badge.svg)](https://codecov.io/gh/RedisAI/RedisAI)
 
 
 # RedisAI

opt/Makefile

@@ -2,11 +2,11 @@
 ROOT:=..
 include readies/mk/main
 
-MK_CMAKE:=1
 MK.cmake:=1
-MK_CMAKE_INSTALL:=1
 MK_CUSTOM_CLEAN:=1
 
+MK_ALL_TARGETS=bindirs fetch build pack
+
 #---------------------------------------------------------------------------------------------- 
 
 define HELP
@@ -61,19 +61,20 @@ DEPS_FLAGS=cpu
 DEVICE=cpu
 endif
 
+#---------------------------------------------------------------------------------------------- 
+
 SRCDIR=..
 BINDIR=$(BINROOT)/src
 DEPS_DIR=$(ROOT)/deps/$(OS)-$(ARCH)-$(DEVICE)
-# INSTALL_DIR=$(ROOT)/bin/$(OS)-$(ARCH)-$(DEVICE)/install
 INSTALL_DIR=$(BINROOT)/install-$(DEVICE)
 
-REDIS_VALGRIND_SUPRESS=$(ROOT)/opt/redis_valgrind.sup
-
 TARGET=$(BINDIR)/redisai.so
 INSTALLED_TARGET=$(INSTALL_DIR)/redisai.so
 
 BACKENDS_PATH ?= $(INSTALL_DIR)/backends
 
+REDIS_VALGRIND_SUPRESS=$(ROOT)/opt/redis_valgrind.sup
+
 #---------------------------------------------------------------------------------------------- 
 
 CMAKE_FILES += \
@@ -113,7 +114,7 @@ include $(MK)/defs
 
 #----------------------------------------------------------------------------------------------
 
-.PHONY: deps fetch pack pack_ramp pack_deps test
+.PHONY: deps prebuild fetch pack pack_ramp pack_deps test
 
 include $(MK)/rules
 
@@ -122,7 +123,8 @@ include $(MK)/rules
 prebuild:
 	$(SHOW)if [ ! -d $(DEPS_DIR) ]; then echo $$'Dependencies are not in place.\nPlease run \'make fetch\'.'; exit 1; fi
 
-$(TARGET): prebuild $(MK_MAKEFILES) $(DEPS)
+$(info $(TARGET): $(MK_MAKEFILES) $(DEPS))
+$(TARGET): $(DEPS)
 	$(SHOW)mkdir -p $(INSTALL_DIR)
 	$(SHOW)$(MAKE) -C $(BINDIR)
 	$(SHOW)$(MAKE) -C $(BINDIR) install
@@ -178,10 +180,9 @@ ifeq ($(COV),1)
 	$(COVERAGE_RESET)
 endif
 	$(SHOW)\
+		DEVICE=$(DEVICE) \
 		MODULE=$(INSTALLED_TARGET) \
-		GEN=$(GEN) \
-		AOF=$(AOF) \
-		SLAVES=$(SLAVES) \
+		GEN=$(GEN) AOF=$(AOF) SLAVES=$(SLAVES) \
 		$(ROOT)/test/tests.sh
 ifeq ($(COV),1)
 	$(COVERAGE_COLLECT_REPORT)

opt/readies/mk/cmake.rules

@@ -3,7 +3,8 @@ ifneq ($(MK.cmake),)
 
 MK_CMAKE_FILES ?= $(SRCDIR)/CMakeLists.txt
 
-$(BINDIR)/Makefile : bindirs $(MK_CMAKE_FILES)
+# bindirs
+$(BINDIR)/Makefile : $(MK_CMAKE_FILES)
 	$(SHOW)if [ ! -d $(BINDIR) ]; then echo "CMake: $(BINDIR) does not exist."; exit 1; fi
 	$(SHOW)cd $(BINDIR); cmake $(CMAKE_WHY) $(CMAKE_FLAGS) $(abspath $(SRCDIR)) $(CMAKE_SINK)
 

test/tests.sh

@@ -30,10 +30,9 @@ help() {
 		AOF=0|1         Tests with --test-aof
 		SLAVES=0|1      Tests with --test-slaves
 		
-		TEST=test     Run specific test (e.g. test.py:test_name)
-		VALGRIND=1    Run with Valgrind
-		VGD=1         Same as VALGRIND=1
-		CALLGRIND=1   Run with Callgrind
+		TEST=test        Run specific test (e.g. test.py:test_name)
+		VALGRIND|VGD=1   Run with Valgrind
+		CALLGRIND|CGD=1  Run with Callgrind
 
 	END
 }