From aadad2dde368c7b2e7b8ee7c6ee7ed6403c11567 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 24 Sep 2015 11:29:24 +0200 Subject: [PATCH] tester: update bc_tester_utils --- .gitignore | 1 + mediastreamer2 | 2 +- tester/common/bc_tester_utils.c | 7 ++++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a90a798cf..78423ad61 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ tester/stereo-record.wav .dirstamp git-clang-format.diff *.log +.bc_tester_utils.tmp diff --git a/mediastreamer2 b/mediastreamer2 index 262c1ca2e..27fc72b2d 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 262c1ca2e48d5c0eedae86cc36579bacd234ee48 +Subproject commit 27fc72b2dc288ed15db9802ab9978b2e82d53cf2 diff --git a/tester/common/bc_tester_utils.c b/tester/common/bc_tester_utils.c index 6b14355b3..603a5786d 100644 --- a/tester/common/bc_tester_utils.c +++ b/tester/common/bc_tester_utils.c @@ -52,7 +52,7 @@ along with this program. If not, see . static char *bc_tester_resource_dir_prefix = NULL; // by default writable will always write near the executable -static char *bc_tester_writable_dir_prefix = "."; +static char *bc_tester_writable_dir_prefix = NULL; int bc_printf_verbosity_info; int bc_printf_verbosity_error; @@ -392,7 +392,7 @@ static void detect_res_prefix(const char* prog) { } if (prefix != NULL) { - if (bc_tester_resource_dir_prefix != NULL) { + if (bc_tester_resource_dir_prefix == NULL) { printf("Resource directory set to %s\n", prefix); bc_tester_set_resource_dir_prefix(prefix); } @@ -406,7 +406,7 @@ static void detect_res_prefix(const char* prog) { // check that we can write in writable directory if (bc_tester_writable_dir_prefix != NULL) { - writable_file = fopen("bc_tester_utils.tmp", "w"); + writable_file = fopen(".bc_tester_utils.tmp", "w"); if (writable_file) { fclose(writable_file); } @@ -431,6 +431,7 @@ void bc_tester_init(void (*ftester_printf)(int level, const char *format, va_lis tester_printf_va = ftester_printf; bc_printf_verbosity_error = iverbosity_error; bc_printf_verbosity_info = iverbosity_info; + bc_tester_writable_dir_prefix = strdup("."); } void bc_tester_set_max_vm(long max_vm_kb) {