On Fri, Jun 21, 2013 at 08:44:23AM -0500, Greg Hellings wrote:
> >
> > OK. I tried running make tests, but the osistest doesn't seem to be
> > included. It'd be nice to get the test suite passing.
> >
> > As a start for fixing osistest, I added osistest to the list of test
> > programs in tests/CMakeLists.txt, and the following command to
> > tests/testsuite/CMakeLists.**txt:
> > COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.**xml ${CMAKE_CURRENT_BINARY_DIR}
> >
> > osistest still fails for me, but I'm not sure it's related to cmake at
> > all. May not be worth holding up the release if the tests pass for others.
>
>
> Since the testsuite is really developer-only and basically only Troy uses
> or maintains it, I've not been on top of keeping the CMake portion
> up-to-date. Troy uses and maintains the autofoo for the library and so he
> just has them churning along as he needs. I'll see about adding the missing
> command - the main difference there is that I force the CMake build to be
> in a different directory whereas most autotools people will build in the
> same directory as source.
>
> Did you try running the testsuite with autotools to see if it works?
I'm attaching a diff to add the osis test to the cmake build. I'm now
able to run make tests in the cmake build and everything passes. (In
case it helps anyone, I had to make sure locales.d was in my ~/.sword/
directory to make the verseparsing test pass.)
-Ben
Index: tests/CMakeLists.txt
===================================================================
--- tests/CMakeLists.txt (revision 2989)
+++ tests/CMakeLists.txt (working copy)
@@ -31,6 +31,7 @@
localetest
mgrtest
modtest
+ osistest
parsekey
rawldidxtest
romantest
Index: tests/testsuite/CMakeLists.txt
===================================================================
--- tests/testsuite/CMakeLists.txt (revision 2989)
+++ tests/testsuite/CMakeLists.txt (working copy)
@@ -6,6 +6,7 @@
tests_configure
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.sh ${CMAKE_CURRENT_BINARY_DIR}
COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.good
${CMAKE_CURRENT_BINARY_DIR}
+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/*.xml ${CMAKE_CURRENT_BINARY_DIR}
COMMAND echo
\"[Install]\\nLocalePath=${CMAKE_CURRENT_SOURCE_DIR}/../../\" >
${CMAKE_CURRENT_BINARY_DIR}/sword.conf
DEPENDS ${test_PROGRAMS}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
_______________________________________________
sword-devel mailing list: sword-devel@crosswire.org
http://www.crosswire.org/mailman/listinfo/sword-devel
Instructions to unsubscribe/change your settings at above page
