Kaydet (Commit) aa3c2526 authored tarafından Caolán McNamara's avatar Caolán McNamara

oss-fuzz: drop our own afl related hackery

Change-Id: Ia6a498c07fffd1790ad433287ef4d1cf82085887
Reviewed-on: https://gerrit.libreoffice.org/43695Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 7b2f4b32
...@@ -155,11 +155,6 @@ class Desktop : public Application ...@@ -155,11 +155,6 @@ class Desktop : public Application
*/ */
void CheckFirstRun( ); void CheckFirstRun( );
/** for ui-testing provide a mechanism to pseudo-restart by closing the
open frames and reopen the frame that appeared post initial startup
*/
static void DoExecute();
static void ShowBackingComponent(Desktop * progress); static void ShowBackingComponent(Desktop * progress);
// on-demand acceptors // on-demand acceptors
......
...@@ -1255,23 +1255,6 @@ struct ExecuteGlobals ...@@ -1255,23 +1255,6 @@ struct ExecuteGlobals
static ExecuteGlobals* pExecGlobals = nullptr; static ExecuteGlobals* pExecGlobals = nullptr;
//This just calls Execute() for all normal uses of LibreOffice, but for
//ui-testing if built with afl-clang-fast++ then on exit it will pseudo-restart
//(up to 100 times)
void Desktop::DoExecute()
{
#if !defined(__AFL_HAVE_MANUAL_CONTROL)
Execute();
#else
while (__AFL_LOOP(1000))
{
Execute();
OpenDefault();
}
#endif
}
int Desktop::Main() int Desktop::Main()
{ {
pExecGlobals = new ExecuteGlobals(); pExecGlobals = new ExecuteGlobals();
...@@ -1663,7 +1646,7 @@ int Desktop::Main() ...@@ -1663,7 +1646,7 @@ int Desktop::Main()
// if this run of the office is triggered by restart, some additional actions should be done // if this run of the office is triggered by restart, some additional actions should be done
DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoQuickstart() ); DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoQuickstart() );
DoExecute(); Execute();
} }
} }
catch(const css::document::CorruptedFilterConfigurationException& exFilterCfg) catch(const css::document::CorruptedFilterConfigurationException& exFilterCfg)
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment