summaryrefslogtreecommitdiff
path: root/dbug/tests.c
diff options
context:
space:
mode:
Diffstat (limited to 'dbug/tests.c')
-rw-r--r--dbug/tests.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/dbug/tests.c b/dbug/tests.c
index 3e77bf82236..4e3642f09e4 100644
--- a/dbug/tests.c
+++ b/dbug/tests.c
@@ -16,7 +16,8 @@ char *push1=0;
const char *func3()
{
DBUG_ENTER("func3");
- DBUG_RETURN(DBUG_EVALUATE("ret3", "ok", "ko"));
+ DBUG_EXECUTE("ret3", DBUG_RETURN("ok"););
+ DBUG_RETURN("ko");
}
void func2()
@@ -72,10 +73,8 @@ int main (int argc __attribute__((unused)),
DBUG_EXECUTE_IF("push", DBUG_PUSH("+t"); );
DBUG_EXECUTE("execute", fprintf(DBUG_FILE, "=> execute\n"); );
DBUG_EXECUTE_IF("set", DBUG_SET("+F"); );
- fprintf(DBUG_FILE, "=> evaluate: %s\n",
- DBUG_EVALUATE("evaluate", "ON", "OFF"));
fprintf(DBUG_FILE, "=> evaluate_if: %s\n",
- DBUG_EVALUATE_IF("evaluate_if", "ON", "OFF"));
+ (DBUG_IF("evaluate_if") ? "ON": "OFF"));
DBUG_EXECUTE_IF("pop", DBUG_POP(); );
{
char s[1000] __attribute__((unused));