Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents ac9bfbd + df7c6a7 commit 2695f91b9fd5548e83f32564e9d49c2442900d07 hochang committed Oct 17, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 modules/mem-cache-local/Makefile
View
8 modules/mem-cache-local/Makefile
@@ -24,14 +24,14 @@ ifeq ($(memcached),)
cd test/binaries/memcached/memcached-1.4.13; ./configure; make; make install; cd ../../../..
-rm -fr test/binaries/memcached
endif
- export LD_LIBRARY_PATH=/usr/local/lib
- memcached -u $(user) -d -m 24 -p 8026 &
+ export LD_LIBRARY_PATH=/usr/local/lib:LD_LIBRARY_PATH
+ memcached -u $(user) -d -m 2000 -p 8026 &
node_modules/.bin/nodeunit test;
killall memcached
test-part:
- export LD_LIBRARY_PATH=/usr/local/lib
- memcached -u $(user) -d -m 24 -p 8026 &
+ export LD_LIBRARY_PATH=/usr/local/lib:LD_LIBRARY_PATH
+ memcached -u $(user) -d -m 2000 -p 8026 &
node_modules/.bin/nodeunit test --reporter junit --output ../../reports
killall memcached

0 comments on commit 2695f91

Please sign in to comment.