diff options
Diffstat (limited to 'testautomation/extensions/optional/includes/location.inc')
| -rwxr-xr-x | testautomation/extensions/optional/includes/location.inc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/testautomation/extensions/optional/includes/location.inc b/testautomation/extensions/optional/includes/location.inc index c23fdfdf922b..262495666cbb 100755 --- a/testautomation/extensions/optional/includes/location.inc +++ b/testautomation/extensions/optional/includes/location.inc @@ -61,14 +61,15 @@ testcase tExtensionLocation warnlog( "Macro execution warning is missing" ) endif - irc = hMacroOrganizerRunMacro( MACRO_NAME ) - if ( irc = 0 ) then - warnlog( "No macro with the given name could be found, aborting" ) - kontext "Makro" - if ( Makro.exists() ) then - Makro.close() - endif + hMacroOrganizerRunMacro( MACRO_NAME ) + + kontext "Makro" + if ( Makro.exists( 1 ) ) then + warnlog( "Macro was not executed") + Makro.close() goto endsub + else + printlog( "Macro was executed") endif kontext "active" @@ -84,11 +85,8 @@ testcase tExtensionLocation warnlog( "No messagebox displayed, please check that the macro is executed" ) endif - irc = hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" ) - irc = hMacroOrganizerRunMacro( MACRO_NAME ) - if ( irc = 0 ) then - warnlog( "No macro with the given name could be found" ) - endif + hExtensionAddGUI( cWorkPath & EXTENSION_NAME , "verbose,InstallForUser" ) + hMacroOrganizerRunMacro( MACRO_NAME ) kontext "active" if ( active.exists( 2 ) ) then |