From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 1 Aug 2010 12:06:43 +0000 (+0200)
Subject: testfw: Set cache_logfile before running each test case
X-Git-Tag: v3.1~126
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12629c547915d99f90275024b8de7239586522e8;p=thirdparty%2Fccache.git

testfw: Set cache_logfile before running each test case
---

diff --git a/test/framework.c b/test/framework.c
index c0d5601b5..95b31823e 100644
--- a/test/framework.c
+++ b/test/framework.c
@@ -142,6 +142,8 @@ void cct_suite_end()
 
 void cct_test_begin(const char *name)
 {
+	extern char *cache_logfile;
+
 	verify_test_suite_name(name);
 	if (verbose) {
 		printf("--- TEST: %s ---\n", name);
@@ -151,7 +153,9 @@ void cct_test_begin(const char *name)
 	cct_chdir(name);
 	current_test = name;
 	failed_asserts_before_test = failed_asserts;
+
 	cc_reset();
+	cache_logfile = getenv("CCACHE_LOGFILE");
 }
 
 void cct_test_end()
diff --git a/test/main.c b/test/main.c
index f5eaef4a2..0a05b5869 100644
--- a/test/main.c
+++ b/test/main.c
@@ -34,8 +34,6 @@ const char USAGE_TEXT[] =
 	"    -h, --help      print this help text\n"
 	"    -v, --verbose   enable verbose logging of tests\n";
 
-extern char *cache_logfile;
-
 int main(int argc, char **argv)
 {
 	static const struct option options[] = {
@@ -74,7 +72,6 @@ int main(int argc, char **argv)
 	if (getenv("RUN_FROM_BUILD_FARM")) {
 		verbose = 1;
 	}
-	cache_logfile = getenv("CCACHE_LOGFILE");
 
 	testdir = format("testdir.%d", (int)getpid());
 	cct_create_fresh_dir(testdir);