diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-05-31 19:06:04 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-05-31 20:00:03 +0300 |
| commit | ff7e2868d61f2958ec86fbd53bb3e2957ca3da39 (patch) | |
| tree | 21d7ee0371a29ecb6bf0296aad6b8cd5643aeb7a /extensions/CustomTarget_automationtest.mk | |
| parent | 9d2e7c3c07b471a89e7fc375eb9094510a3cacd7 (diff) | |
Run soffice frpm instdir (but CustomTarget_automationtest still can't work)
WScript.CreateObject() takes the symbolic name of the object class
that it then looks up from the Registry to find the CLSID of the
class. I don't really know how we could make this unit test work at
build time. Keep it still commented out in the module makefile.
Change-Id: I73418754db9ccc3f5d384754d4d3be74ae1f9dca
Diffstat (limited to 'extensions/CustomTarget_automationtest.mk')
| -rw-r--r-- | extensions/CustomTarget_automationtest.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/extensions/CustomTarget_automationtest.mk b/extensions/CustomTarget_automationtest.mk index b1984d98d153..1c115b09a8b5 100644 --- a/extensions/CustomTarget_automationtest.mk +++ b/extensions/CustomTarget_automationtest.mk @@ -11,14 +11,17 @@ $(eval $(call gb_CustomTarget_CustomTarget,extensions/automationtest)) extensions_AUTOMATIONTESTDIR := $(call gb_CustomTarget_get_workdir,extensions/automationtest) -extensions_AUTOMATIONTESTLOG := $(extensions_AUTOMATIONTESTDIR)/automationtest.log +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) \ + 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_AUTOMATIONTESTLOG) || \ - (cat $(extensions_AUTOMATIONTESTLOG) && exit 1) + cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs $(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG2) || \ + (cat $(extensions_AUTOMATIONTESTLOG1) $(extensions_AUTOMATIONTESTLOG2) && exit 1) # vim:set shiftwidth=4 tabstop=4 noexpandtab: |