From bca91c8ef36c6756dfc88b9358bee092458a5d76 Mon Sep 17 00:00:00 2001 From: Herman Venter Date: Fri, 28 Jun 2013 11:09:16 -0700 Subject: [PATCH] Really turn off tutorial output this time and re-enable tests that failed because of tutorial mode. It turns out that Tutorial=0 means "auto" and -1 means "off". With auto tutorials, the hphpd.hdf file got updated and test behavior got flaky. Even worse, the non ASCII characters in the tutorial output broke the test runner in a way that made it look like tests passed when you put up a differential, only to fail in contbuild. --- hphp/runtime/debugger/break_point.cpp | 1 - .../quick/debugger/{break1.php.disabled => break1.php} | 0 .../quick/debugger/{break2.php.disabled => break2.php} | 0 .../debugger/{exception1.php.disabled => exception1.php} | 0 hphp/test/quick/debugger/hphpd.hdf | 8 +------- 5 files changed, 1 insertion(+), 8 deletions(-) rename hphp/test/quick/debugger/{break1.php.disabled => break1.php} (100%) rename hphp/test/quick/debugger/{break2.php.disabled => break2.php} (100%) rename hphp/test/quick/debugger/{exception1.php.disabled => exception1.php} (100%) diff --git a/hphp/runtime/debugger/break_point.cpp b/hphp/runtime/debugger/break_point.cpp index 489a774f7..6a901b5a4 100644 --- a/hphp/runtime/debugger/break_point.cpp +++ b/hphp/runtime/debugger/break_point.cpp @@ -13,7 +13,6 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -// force test run #include "hphp/runtime/debugger/break_point.h" #include "hphp/runtime/debugger/debugger.h" diff --git a/hphp/test/quick/debugger/break1.php.disabled b/hphp/test/quick/debugger/break1.php similarity index 100% rename from hphp/test/quick/debugger/break1.php.disabled rename to hphp/test/quick/debugger/break1.php diff --git a/hphp/test/quick/debugger/break2.php.disabled b/hphp/test/quick/debugger/break2.php similarity index 100% rename from hphp/test/quick/debugger/break2.php.disabled rename to hphp/test/quick/debugger/break2.php diff --git a/hphp/test/quick/debugger/exception1.php.disabled b/hphp/test/quick/debugger/exception1.php similarity index 100% rename from hphp/test/quick/debugger/exception1.php.disabled rename to hphp/test/quick/debugger/exception1.php diff --git a/hphp/test/quick/debugger/hphpd.hdf b/hphp/test/quick/debugger/hphpd.hdf index f24dc5fa5..61ca22950 100644 --- a/hphp/test/quick/debugger/hphpd.hdf +++ b/hphp/test/quick/debugger/hphpd.hdf @@ -62,11 +62,5 @@ Color { LineNo = GRAY } } -Tutorial = 0 -Tutorial { - Visited { - 0 = 376d06037a5af010a610dd885c6817c1 - 1 = d497d02bce18120e9ae2b91992a9ce60 - } -} +Tutorial = -1 MaxCodeLines = -1