diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-18 12:45:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-18 14:44:47 +0200 |
commit | 359472b2b50165966c27c239eccd3ecfb03e2acc (patch) | |
tree | af53647a222e72588554cbcf323afca090f3b288 /scp2 | |
parent | b538fc543ecfbafef94b15ef068890c22d7f2218 (diff) |
Remove *_Test product, so cppunittester can be NONE again
...as per #libreoffice-dev IRC:
Sep 19 10:32:24 <mst__> sberg, moggi why the hell is that thing named
"cppunit/cppunittester" and inside a subdir? it's obstructing my attempt to
put it in $(INSTDIR)/program
Sep 19 10:33:28 <mst__> (... and if you wonder "wtf does it have to do with
INSTDIR" you have never heard of awesome LibreOffice_Test installset.... not
that i would know who needs it :)
Sep 19 10:36:36 <sberg> mst__, it is in a subdir of solver/*/bin so that on
Windows it would not accidentally have picked DLLs next to itself instead of
the module-local DLLs it was supposed to test (back when we had module-local
output trees)
Sep 19 10:37:02 <mst__> sberg, ahh hysteric reasons then, /me renames it
Sep 19 10:37:55 <tml> mst__, if nobody you know uses LibreOffice_Test, just kill
it?
Sep 19 10:38:59 <sberg> mst__, tml, LibreOffice_Test was conceived by pmladek
and/or kendy, IIRC
Sep 19 10:40:31 * kendy does not remember anything about it :-)
Sep 19 10:42:17 <sberg> wasn't that something so users (or QA people?) could
easily run the smoketest against an installation, to see whether the
installation is any good at all, by installing that LibreOffice_Test alongside
the installation proper?
Sep 19 10:43:26 <sberg> mst__, ...and I'd unscientifically vote to kill it
Sep 19 11:34:23 <pmladek> mst__, sberg: I have created the LibreOffice_Test
package for one QA guy. He does not longer work on LO. I am not sure if anyone
else started to use it. So, I think that it can be killed.
Oct 17 18:18:07 <tml_> sberg: have you ever noticed that when you try to
actually run instdir/unxmacxi/LibreOfficeDev.app , the system actually tries
to run cppunittester inside the app bundle (it says so in the crash report)
(it crashes because cppunittester requires a specialized DYLIB_LIBRARY_PATH
apparently)
Oct 17 18:19:29 <tml_> I suspect that the system when cppunittester as part of
the build process is run from inside instdir (i.e. inside an app bundle) the
system "caches" this false knowledge, and thinks that the executable of the
app bundle is cppunittester...
Oct 17 18:19:36 <sberg> tml_, no, never noticed; with "run
instdir/unxmacxi/LibreOfficeDev.app" you mean calling "open
instdir/unxmacxi/LibreOfficeDev.app"? (I always call
.app/Contenst/MacOS/program explicitly)
Oct 17 18:19:52 <tml_> yes, I mean "open instdir/..."
Oct 17 18:20:53 <tml_> some googling tells me that at least years ago, the
CFBundleExecutable key in the Info.plist is ignored if it is manually changed,
so I guess similar caching of mapping between an app bundle and which
executable to actually run happens in this case
Oct 17 18:23:17 <tml_> and last year somebody even claims "And while on Mountain
Lion, CFBundleExecutable seems to be a no-op", which would be odd, surely
there must be widely used apps that have several executables inside the MacOS
directory; how would the system know which one to run when the app is run?
Oct 17 18:24:38 <tml_> hmm, apparently the code that handles this might be open
source even, http://www.opensource.apple.com/source/CF/CF-744.18/CFBundle.c
Oct 17 18:25:52 <tml_> some mention of "caches" there yes, my guesses might be
right
Oct 17 18:27:05 <tml_> if I cp -R instdir/unxmacxi/LibreOffice.app foo.app and
open foo.app, it works fine
Oct 17 18:28:33 <tml_> anyway, I guess it would be cleaner to have cppunittester
somewhere else even without this problem
Oct 17 18:37:09 <sberg> tml_, yes, IIRC having cppunittester in instdir was a
misguided mst decision, because that odd LibreOffice_Test product (that
pmladek said nobody needs any longer anyway) includes it; I think consensus
was to kill LibreOffice_Test and move cppunittester where all the other NONE
executables are, but looks like nobody executed
Oct 17 18:37:55 <tml_> ah ok, so mst should know what needs to be done? good, no
need for me to try to hack this now then
Oct 17 18:38:19 <sberg> tml_, I'll do the cleanup tomorrow, unless somebody
beats me
This removes smoketest/losmoketest et al along with the *_Test product, as they
seem to not make sense without it anyway. smoketest/Executable_libtest.mk
appears to be a test that could also be run during the build, and only ended up
in the *_Test product by accident, so I left it untouched for now.
Change-Id: I8024472c909fe0a885eb08ef4d3777f8a9e1f7c8
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/InstallModule_smoketest.mk | 16 | ||||
-rw-r--r-- | scp2/InstallScript_test.mk | 16 | ||||
-rw-r--r-- | scp2/Module_scp2.mk | 2 | ||||
-rw-r--r-- | scp2/source/smoketest/smoketest.scp | 171 |
4 files changed, 0 insertions, 205 deletions
diff --git a/scp2/InstallModule_smoketest.mk b/scp2/InstallModule_smoketest.mk deleted file mode 100644 index f3abe7339123..000000000000 --- a/scp2/InstallModule_smoketest.mk +++ /dev/null @@ -1,16 +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_InstallModule_InstallModule,scp2/smoketest)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/smoketest,\ - scp2/source/smoketest/smoketest \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_test.mk b/scp2/InstallScript_test.mk deleted file mode 100644 index 18325c2439fc..000000000000 --- a/scp2/InstallScript_test.mk +++ /dev/null @@ -1,16 +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_InstallScript_InstallScript,test)) - -$(eval $(call gb_InstallScript_use_modules,test,\ - scp2/smoketest \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 05911c51faa6..41711fc7fa53 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -26,12 +26,10 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_onlineupdate \ InstallModule_ooo \ InstallModule_python \ - InstallModule_smoketest \ InstallModule_ure \ InstallModule_writer \ InstallModule_xsltfilter \ InstallScript_setup_osl \ - InstallScript_test \ $(if $(filter ODK,$(BUILD_TYPE)), \ InstallModule_sdkoo \ InstallScript_sdkoo \ diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp deleted file mode 100644 index 9b932081e136..000000000000 --- a/scp2/source/smoketest/smoketest.scp +++ /dev/null @@ -1,171 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#include "macros.inc" - -Installation gid_Installation_Test - ProductName = "${PRODUCTNAME}"; - ProductVersion = "${PRODUCTVERSION}"; - ProductExtension = "${PRODUCTEXTENSION}"; -#if defined WNT - DefaultDestPath = "<winprogpath>\%PRODUCTNAME"; -#else - DefaultDestPath = "/opt/%PRODUCTNAME"; -#endif -End - -Module gid_Module_Root_Smoketest - Name = "smoketest"; - Description = "smoketest"; - PackageInfo = "packinfo_test.txt"; -End - -#ifndef MACOSX -Directory gid_Test_Dir_Brand_Root - ParentID = PREDEFINED_PROGDIR; - #ifdef WNT - HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}"; - #else - HostName = "."; - #endif - Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE); -End -#endif - -#if MACOSX -Directory gid_Test_Dir_Bundle - ParentID = PD_PROGDIR; - HostName = "%PRODUCTNAME.app"; - LangPackHostName = "%PRODUCTNAME Language Pack.app"; -End - -Directory gid_Test_Dir_Bundle_Contents - ParentID = gid_Test_Dir_Bundle; - HostName = "Contents"; - Styles = (OFFICEDIRECTORY); -End -#endif - -Directory gid_Test_Brand_Dir_Program -#if defined MACOSX - ParentID = gid_Test_Dir_Bundle_Contents; - DosName = "MacOS"; -#else - ParentID = gid_Test_Dir_Brand_Root; - DosName = "program"; -#endif -End - -Directory gid_Test_Brand_Dir_Share -#if defined MACOSX - ParentID = gid_Test_Dir_Bundle_Contents; -#else - ParentID = gid_Test_Dir_Brand_Root; -#endif - DosName = "share"; -End - -Directory gid_Test_Brand_Dir_Share_Test - ParentID = gid_Test_Brand_Dir_Share; - DosName = "test"; -End - - -File gid_Test_File_Txt_License - TXT_FILE_BODY; - Dir = gid_Test_Brand_Dir_Share_Test; - #ifdef UNX - Name = "LICENSE"; - #endif - #ifdef WNT - Name = "license.txt"; - #endif - Styles = (PACKED, SCPZIP_REPLACE); -End - -File gid_Test_File_Txt_Readme - TXT_FILE_BODY; - Dir = gid_Test_Brand_Dir_Share_Test; - #ifdef UNX - Name = "README_en-US"; - #endif - #ifdef WNT - Name = "readme_en-US.txt"; - #endif - Styles = (PACKED, SCPZIP_REPLACE); -End - -File gid_Test_File_Misc_Smoketestdoc - TXT_FILE_BODY; - Dir = gid_Test_Brand_Dir_Share_Test; - Name = "smoketestdoc.sxw"; - Styles = (PACKED, SCPZIP_REPLACE); -End - -File gid_Test_File_Bin_LOSmoketest - BIN_FILE_BODY; - Dir = gid_Test_Brand_Dir_Program; - Name = "losmoketest"; - Styles = (PACKED); -End - -File gid_Test_File_Exe_Cppunittester - BIN_FILE_BODY; - Dir = gid_Test_Brand_Dir_Program; - Name = "cppunittester"; - Styles = (PACKED); -End - -File gid_Test_File_Lib_Cppunit - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Test_Brand_Dir_Program; - #ifdef UNX - Name = STRING(CONCAT3(libcppunit-1.13,UNXSUFFIX,.0)); - #endif -End - -File gid_Test_File_Lib_Smoketest - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Test_Brand_Dir_Program; - #ifdef UNX - Name = STRING(CONCAT2(libsmoketest,UNXSUFFIX)); - #endif -End - -File gid_Test_File_Lib_Test - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Test_Brand_Dir_Program; - #ifdef UNX - Name = STRING(CONCAT2(libtest,UNXSUFFIX)); - #endif -End - -File gid_Test_File_Lib_Unotest - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Test_Brand_Dir_Program; - #ifdef UNX - Name = STRING(CONCAT2(libunotest,UNXSUFFIX)); - #endif -End - -File gid_Test_File_Lib_Unoexceptionprotector - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Test_Brand_Dir_Program; - #ifdef UNX - Name = STRING(CONCAT2(unoexceptionprotector,UNXSUFFIX)); - #endif -End - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |