Update configure (#88)

* Fix configure.sh to update CRoaring deps path

* Fix make jemalloc

* Fix amalgamation

* Run tests with valgrind after redis/redis#4284 (#89)

configure.sh

@@ -12,16 +12,19 @@ function amalgamate_croaring()
   cd src 
   # generates header files
   ../deps/CRoaring/amalgamation.sh 
-  cp ../deps/CRoaring/roaring.c .
-  cp ../deps/CRoaring/roaring.h .
-  rm roaring.hh && rm amalgamation_demo.c && rm amalgamation_demo.cpp
   popd
 } 
 function configure_redis()
 {
+  pushd .
   cd deps/redis
+
+  cd deps
+  make hiredis jemalloc linenoise lua
+  cd ..
+
   make
-  cd -
+  popd
 }
 function configure_hiredis()
 {

helper.sh

@@ -32,7 +32,7 @@ function start_redis()
   done
 
   local REDIS_COMMAND="./deps/redis/src/redis-server --loadmodule ./build/libredis-roaring.so"
-  local VALGRIND_COMMAND="valgrind --leak-check=yes --show-leak-kinds=definite,indirect --error-exitcode=1 --log-file=$LOG_FILE"
+  local VALGRIND_COMMAND="valgrind --leak-check=yes --show-leak-kinds=definite,indirect --suppressions=./deps/redis/src/valgrind.sup --error-exitcode=1 --log-file=$LOG_FILE"
   local AOF_OPTION="--appendonly $USE_AOF"
   if [ "$USE_VALGRIND" == "no" ]; then
     VALGRIND_COMMAND=""

test.sh

@@ -12,17 +12,15 @@ function unit()
 function integration_1()
 {
   stop_redis
-  # FIXME should be "yes", but we are waiting on redis issue #4284
-  start_redis "no"
+  start_redis --valgrind
   ./tests/integration_1.sh
   stop_redis
   echo "All integration (1) tests passed"
 }
 function integration_2()
 {
   stop_redis
-  # FIXME should be "--valgrind", but we are waiting on redis issue #4284
-  start_redis --aof
+  start_redis --valgrind --aof
   ./tests/integration_1.sh
   stop_redis