From 3b87e2bd2ac8d6f4df3068fa4ff4b5b44765d060 Mon Sep 17 00:00:00 2001 From: amayank Date: Wed, 6 Mar 2013 15:12:38 -0800 Subject: [PATCH] Use version 3.8.1 for valgrind in third_party and do away with log files Summary: valgrind 3.7.0 used currently has a bug that needs LD_PRELOAD being set as a workaround. This caused problems when run on jenkins. 3.8.1 has fixed this issue and we should use it from third party Also, have done away with log files. The whole output will be there on the terminal and the failed tests will be listed at the end. This is done because jenkins only lets us download the different files and not view them in the browser which is undesirable. Test Plan: make valgrind_check Reviewers: akushner, dhruba, vamsi, sheki, heyongqiang Reviewed By: sheki CC: leveldb Differential Revision: https://reviews.facebook.net/D9171 --- Makefile | 6 +++--- VALGRIND_LOGS/README | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 214903cc0..5128559d4 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,8 @@ MEMENVOBJECTS = $(MEMENV_SOURCES:.cc=.o) TESTUTIL = ./util/testutil.o TESTHARNESS = ./util/testharness.o $(TESTUTIL) VALGRIND_ERROR = 2 -VALGRIND_DIR = "VALGRIND_LOGS" +VALGRIND_DIR = VALGRIND_LOGS +VALGRIND_VER = /mnt/gvfs/third-party/3748fabb2c5e033009597bae1f9ef8bf4b218581/gcc-4.7.1-glibc-2.14.1/valgrind/valgrind-3.8.1/91ddd43/bin/valgrind VALGRIND_OPTS = --error-exitcode=$(VALGRIND_ERROR) --leak-check=full TESTS = \ @@ -120,8 +121,7 @@ valgrind_check: all $(PROGRAMS) $(TESTS) echo TIMES in seconds TAKEN BY TESTS ON VALGRIND > $(VALGRIND_DIR)/valgrind_tests_times; \ for t in $(filter-out skiplist_test,$(TESTS)); do \ stime=`date '+%s'`; \ - valgrind $(VALGRIND_OPTS) \ - --log-file=$(VALGRIND_DIR)/valgrind_log_$$t ./$$t; \ + $(VALGRIND_VER) $(VALGRIND_OPTS) ./$$t; \ if [ $$? -eq $(VALGRIND_ERROR) ] ; then \ echo $$t >> $(VALGRIND_DIR)/valgrind_failed_tests; \ fi; \ diff --git a/VALGRIND_LOGS/README b/VALGRIND_LOGS/README index bdaf738b6..57d7cb960 100644 --- a/VALGRIND_LOGS/README +++ b/VALGRIND_LOGS/README @@ -1,4 +1,4 @@ -This directory stores the tests that failed valgrind and the logs associated +This directory stores the tests that failed valgrind and the times associated with the failed runs. "make valgrind_check" can be invoked to call valgrind on the rocksdb tests and generate files in this directory