STORM-977 llmediaplugintest shows up even though -DLL_TESTS:BOOL=OFF has been used
Review Request #144 - Created Feb. 8, 2011 and submitted
Jonathan Yap | Reviewers | ||
2.6 | viewer | ||
STORM-977 | |||
None | viewer-development |
llmediaplugintest shows up to be compiled even though -DLL_TESTS:BOOL=OFF has been used on the command line. This cmake file does not use the call to LL_ADD_PROJECT_UNIT_TESTS that other cmake files do. LL_ADD_PROJECT_UNIT_TESTS is usually wrapped with if(LL_TESTS) I could not figure out which lines suppress the inclusion of copy_plugintest_libs and llmediaplugintest into the list of what is to be built so wrapped the entire file around if(LL_TESTS). If there is some better way to more exactly target these two items please point it out.
Posted (Feb. 8, 2011, 10:41 a.m.)
> If there is some better way to more exactly target these two items please point it out. You should be able to get the same effect when wrapping the only place where this file is referenced in a LL_TESTS condition, i.e., change https://bitbucket.org/lindenlab/viewer-development/src/b0bceb572090/indra/CMakeLists.txt#cl-74 from if (NOT LINUX) to if (LL_TESTS AND NOT LINUX) (and the same for the endif, of course) Whether that's a better place, I don't know. Though, I think LL_TESTS is the wrong conditional here, anyway. LL_TESTS is for enabling unit and integration tests. llplugintest however, I have learned on IRC today, seems to be a fully separate program based on and similar to uBrowser that could be used to load and test individual llmediaplugins, would it communicate with them in the same way the viewer does. (Which, according to MichelleZ, it doesn't, thus potentially misleading developers of new plugins.) It should probably not be built unless explicitly requested, thus a new variable, defaulting to OFF and different from LL_TESTS would suit this much better. Or, just delete the referencing at https://bitbucket.org/lindenlab/viewer-development/src/b0bceb572090/indra/CMakeLists.txt#cl-75 completely, thus unconditionally removing it from the dependencies of the viewer itself, and have those that want to build it explicitly state it as a build target.
Posted (Feb. 16, 2011, 10:09 a.m.)
If you want to bypass the entire make file for llplugintest, it seems to me better to do it at the indra/CMakeLists.txt level. There's only one line in there that's relevant to llplugintest. Could you try that out?
Review request changed
Updated (Feb. 16, 2011, 11:32 a.m.)
-
- added Diff r2
Updated code per Merov's request and Boroondas' suggestion.
Other reviews