diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-09-24 17:12:56 +1000 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2014-10-06 12:34:33 +0200 |
| commit | 3105737c4b38b3cb4f9408cfc82cf8b49bc3fb2e (patch) | |
| tree | 2df6b80e0b718f9dcbbdf9428652aa363855c8ae /ctdb/tests | |
| parent | 1c8c0be6f97f74169c0b46be4df2245aa631186a (diff) | |
| download | samba-3105737c4b38b3cb4f9408cfc82cf8b49bc3fb2e.tar.gz | |
ctdb-logging: Change LogLevel to DEBUGLEVEL
For compatibility with current Samba debug.[ch].
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'ctdb/tests')
| -rw-r--r-- | ctdb/tests/scripts/unit.sh | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_functest.c | 4 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_porting_tests.c | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/ctdb_takeover_tests.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ctdb/tests/scripts/unit.sh b/ctdb/tests/scripts/unit.sh index 4eccada48df..38b7e21c8cc 100644 --- a/ctdb/tests/scripts/unit.sh +++ b/ctdb/tests/scripts/unit.sh @@ -124,7 +124,7 @@ result_filter_default () _date_time_pid='[0-9/][0-9/]*\ [0-9:\.][0-9:\.]*\ \[[\ 0-9][\ 0-9]*\]' sed -e "s@^${_date_time_pid}:@DATE\ TIME\ \[PID\]:@" } -TEST_DATE_STAMP="DATE TIME [PID]: " +TEST_DATE_STAMP="" # Override this function to customise output filtering. result_filter () diff --git a/ctdb/tests/src/ctdb_functest.c b/ctdb/tests/src/ctdb_functest.c index 16ca4fddd64..9eaae55765d 100644 --- a/ctdb/tests/src/ctdb_functest.c +++ b/ctdb/tests/src/ctdb_functest.c @@ -162,9 +162,9 @@ static void usage(void) int main(int argc, const char *argv[]) { - LogLevel = DEBUG_DEBUG; + DEBUGLEVEL = DEBUG_DEBUG; if (getenv("CTDB_TEST_LOGLEVEL")) { - LogLevel = atoi(getenv("CTDB_TEST_LOGLEVEL")); + DEBUGLEVEL = atoi(getenv("CTDB_TEST_LOGLEVEL")); } if (argc < 2) { diff --git a/ctdb/tests/src/ctdb_porting_tests.c b/ctdb/tests/src/ctdb_porting_tests.c index bd783610865..e95c25d978a 100644 --- a/ctdb/tests/src/ctdb_porting_tests.c +++ b/ctdb/tests/src/ctdb_porting_tests.c @@ -264,7 +264,7 @@ int main(int argc, const char *argv[]) int extra_argc = 0; poptContext pc; - LogLevel = DEBUG_INFO; + DEBUGLEVEL = DEBUG_INFO; pc = poptGetContext(argv[0], argc, argv, popt_options, POPT_CONTEXT_KEEP_FIRST); diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c index 04b49e879b2..8b07325d045 100644 --- a/ctdb/tests/src/ctdb_takeover_tests.c +++ b/ctdb/tests/src/ctdb_takeover_tests.c @@ -598,9 +598,9 @@ static void usage(void) int main(int argc, const char *argv[]) { - LogLevel = DEBUG_DEBUG; + DEBUGLEVEL = DEBUG_DEBUG; if (getenv("CTDB_TEST_LOGLEVEL")) { - LogLevel = atoi(getenv("CTDB_TEST_LOGLEVEL")); + DEBUGLEVEL = atoi(getenv("CTDB_TEST_LOGLEVEL")); } if (argc < 2) { |