diff --git a/extensions/CustomTarget_automationtest.mk b/extensions/CustomTarget_automationtest.mk deleted file mode 100644 index b6de71b74211..000000000000 --- a/extensions/CustomTarget_automationtest.mk +++ /dev/null @@ -1,29 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_CustomTarget_CustomTarget,extensions/automationtest)) - -extensions_AUTOMATIONTESTDIR := $(gb_CustomTarget_workdir)/extensions/automationtest - -extensions_AUTOMATIONTESTLOG1 := $(extensions_AUTOMATIONTESTDIR)/automationtest.1.log -extensions_AUTOMATIONTESTLOG2 := $(extensions_AUTOMATIONTESTDIR)/automationtest.2.log - -$(call gb_CustomTarget_get_target,extensions/automationtest) : \ - $(SRCDIR)/extensions/qa/ole/automationtest.vbs \ - | $(extensions_AUTOMATIONTESTDIR)/.dir - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),VBS,1) - $(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),VBS) - SAL_LOG=+INFO.extensions.olebridge+WARN $(INSTDIR)/program/soffice 2>$(extensions_AUTOMATIONTESTLOG1) & - sleep 10 - $(call gb_Helper_abbreviate_dirs, \ - cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs $(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG2) || \ - (cat $(extensions_AUTOMATIONTESTLOG1) $(extensions_AUTOMATIONTESTLOG2) && exit 1) - $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),VBS) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index cfd7cda7d2c2..b1cc40d8dd79 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -90,10 +90,6 @@ $(eval $(call gb_Module_add_targets,extensions,\ Library_oleautobridge \ )) -# $(eval $(call gb_Module_add_subsequentcheck_targets,extensions,\ -# CustomTarget_automationtest \ -# )) - endif # WNT ifeq ($(OS),MACOSX) diff --git a/extensions/qa/ole/automationtest.vbs b/extensions/qa/ole/automationtest.vbs deleted file mode 100644 index 9b5dff05e957..000000000000 --- a/extensions/qa/ole/automationtest.vbs +++ /dev/null @@ -1,132 +0,0 @@ -' -*- tab-width: 4; indent-tabs-mode: nil -*- - -If WScript.Arguments.Count <> 1 Then - WScript.Echo "Pass $(SRCDIR) as parameter" - WScript.Quit(1) -End If - -srcdir = WScript.Arguments.Item(0) - -exitStatus = 0 - -testCounter = 0 -okCounter = 0 - -Sub ExitWithReport - If okCounter <> testCounter Then - exitStatus = 1 - End If - WScript.Echo "OK (" + CStr(okCounter) + ")" - WScript.Quit(exitstatus) -End Sub - -Sub CheckFatal(expr) - testCounter = testCounter + 1 - If Not Eval(expr) Then - WScript.Echo "FAIL: " & expr - ExitWithReport - Else - WScript.Echo "PASS: " & expr - okCounter = okCounter + 1 - End If -End Sub - -Sub Check(expr) - testCounter = testCounter + 1 - If Not Eval(expr) Then - WScript.Echo "FAIL: " & expr - Else - WScript.Echo "PASS: " & expr - okCounter = okCounter + 1 - End If -End Sub - -Sub CheckIfExpected(expr, expected) - testCounter = testCounter + 1 - actual = Eval(expr) - If actual <> expected Then - WScript.Echo "FAIL: Value of '" & expr & "' was expected to be '" & CStr(expected) & "', but was " & CStr(actual) - Else - WScript.Echo "PASS: " & expr & " == " & CStr(expected) - okCounter = okCounter + 1 - End If -End Sub - -Sub CheckErrorFatal(test) - testCounter = testCounter + 1 - Execute(test) - If Err.Number <> 0 Then - WScript.Echo "FAIL: " & test - WScript.Echo "ERROR: " & Err.Description - ExitWithReport - Else - WScript.Echo "PASS: " & test - okCounter = okCounter + 1 - End If -End Sub - -Sub CheckError(test) - testCounter = testCounter + 1 - Execute(test) - If Err.Number <> 0 Then - WScript.Echo "FAIL: " & test - WScript.Echo "ERROR: " & Err.Description - Else - WScript.Echo "PASS: " & test - okCounter = okCounter + 1 - End If -End Sub - -WScript.Echo "Running Automation client tests" - -On Error Resume Next - -' FIXME: How can we ever make this work specifically with the -' LibreOffice in instdir, when WScript.CreateObject() wants the -' symbolic name that it then looks up from the Registry to find the -' CLSID of the class? - -CheckErrorFatal "Set writer = WScript.CreateObject(""Writer.Application"")" -CheckErrorFatal "writer.Visible = True" -CheckErrorFatal "writer.Caption = ""=== This is Writer ===""" -CheckErrorFatal "writer.ShowMe" - -CheckErrorFatal "Set documents = writer.Documents" - -' Open two randomly chosen documents -CheckErrorFatal "Set d1 = documents.Open(""" & srcdir & "/sw/qa/extras/ww8export/data/n325936.doc"")" -CheckErrorFatal "Set d2 = documents.Open(""" & srcdir & "/sw/qa/extras/ww8export/data/bnc636128.doc"")" - -CheckErrorFatal "n1 = d1.FullName" -CheckErrorFatal "n2 = d2.FullName" - -CheckIfExpected "n1", "n325936.doc" -CheckIfExpected "n2", "bnc636128.doc" - -CheckErrorFatal "Set c1 = d1.Content" -CheckErrorFatal "Set c2 = d2.Content" - -' The range of characters in these documents -CheckIfExpected "c1.Start", 0 -CheckIfExpected "c1.End", 4 -CheckIfExpected "c2.Start", 0 -CheckIfExpected "c2.End", 42 - -' Check number of paragraphs in each document -CheckErrorFatal "Set p1 = d1.Paragraphs" -nparas = 0 -For Each i in p1 - nparas = nparas + 1 -Next -CheckIfExpected "nparas", 1 - -CheckErrorFatal "Set p2 = d2.Paragraphs" -nparas = 0 -For Each i in p2 - nparas = nparas + 1 -Next -CheckIfExpected "nparas", 1 - -CheckErrorFatal "writer.Quit" - -ExitWithReport