Blob Blame History Raw
diff -up openbabel-2.3.2/scripts/python/examples/testpybel.py.tests openbabel-2.3.2/scripts/python/examples/testpybel.py
--- openbabel-2.3.2/scripts/python/examples/testpybel.py.tests	2012-10-03 21:08:51.000000000 +0200
+++ openbabel-2.3.2/scripts/python/examples/testpybel.py	2014-04-27 02:52:33.409199059 +0200
@@ -336,7 +336,7 @@ class TestPybel(TestToolkit):
     tpsaname = "TPSA"
     Nbits = 3
     Nfpbits = 32
-    datakeys = ['NSC', 'Comment', 'OpenBabel Symmetry Classes']
+    datakeys = ['NSC', 'Comment', 'OpenBabel Symmetry Classes', 'MOL Chiral Flag']
 
     def testFP_FP3(self):
         "Checking the results from FP3"
diff -up openbabel-2.3.2/test/CMakeLists.txt.tests openbabel-2.3.2/test/CMakeLists.txt
--- openbabel-2.3.2/test/CMakeLists.txt.tests	2012-10-03 21:08:16.000000000 +0200
+++ openbabel-2.3.2/test/CMakeLists.txt	2014-04-27 01:45:09.814474935 +0200
@@ -2,7 +2,7 @@
 add_definitions(-DTESTDATADIR="\\"${CMAKE_SOURCE_DIR}/test/files/\\"")
 
 # define FORMATDIR for location of format plugin binaries
-add_definitions(-DFORMATDIR="\\"${openbabel_BINARY_DIR}/lib/\\"")
+add_definitions(-DFORMATDIR="\\"${openbabel_BINARY_DIR}/lib${LIB_SUFFIX}/\\"")
 
 ###########################################################
 #  new tests using obtest.h
@@ -64,7 +64,7 @@ foreach(test ${tests})
   add_test(${test}_Test ${TEST_PATH}/test_${test})
   set_tests_properties(${test}_Test PROPERTIES
     FAIL_REGULAR_EXPRESSION "ERROR;FAIL;Test failed"
-    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib")
+    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
 endforeach(test ${tests})
 
 ############################################################
@@ -127,7 +127,7 @@ if(WITH_INCHI)
              ${TEST_PATH}/test_inchiwrite ${inchidata}/${test} ${inchidata}/${test}.txt)
     set_tests_properties(inchi${test}_Test PROPERTIES
                          FAIL_REGULAR_EXPRESSION "Not ok"
-                         ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib"
+                         ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
     )
   endforeach(test ${inchitests})
 endif(WITH_INCHI)
@@ -141,7 +141,7 @@ foreach(test ${old_tests})
   add_test(${test}_Test ${TEST_PATH}/test_${test})
   set_tests_properties(${test}_Test PROPERTIES
     FAIL_REGULAR_EXPRESSION "not ok"
-    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib"
+    ENVIRONMENT "BABEL_DATADIR=${CMAKE_SOURCE_DIR}/data;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
  )
 endforeach(test ${old_tests})
 
@@ -156,8 +156,8 @@ if(NOT BUILD_SHARED)
 endif()
 install(TARGETS roundtrip
                 RUNTIME DESTINATION bin
-                LIBRARY DESTINATION lib
-                ARCHIVE DESTINATION lib
+                LIBRARY DESTINATION lib${LIB_SUFFIX}
+                ARCHIVE DESTINATION lib${LIB_SUFFIX}
 )
 
 ###########################
@@ -174,10 +174,10 @@ if(NOT MINGW AND NOT CYGWIN)
         babel sym fastsearch unique kekule)
     foreach(pytest ${pytests})
     SET_SOURCE_FILES_PROPERTIES(test${pytest}.py PROPERTIES
-      PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib"
-      BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib"
+      PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
+      BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
       BABEL_DATADIR "${CMAKE_SOURCE_DIR}/data"
-      LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib"
+      LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
     )
       ADD_PYTHON_TEST(pytest_${pytest} test${pytest}.py)
       set_tests_properties(pytest_${pytest} PROPERTIES
@@ -196,10 +196,10 @@ if (PYTHON_BINDINGS)
       bindings _pybel example)
   foreach(pybindtest ${pybindtests})
     SET_SOURCE_FILES_PROPERTIES(test${pybindtest}.py PROPERTIES
-        PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib"
-        BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib"
+        PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
+        BABEL_LIBDIR "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
         BABEL_DATADIR "${CMAKE_SOURCE_DIR}/data"
-        LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib"
+        LD_LIBRARY_PATH "${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
     )
     if(MSVC)
       SET_SOURCE_FILES_PROPERTIES(test${pybindtest}.py PROPERTIES