diff --git a/common/cmake_modules/MakeDistFiles.cmake b/common/cmake_modules/MakeDistFiles.cmake index 675ac32911..68aa8b3edd 100644 --- a/common/cmake_modules/MakeDistFiles.cmake +++ b/common/cmake_modules/MakeDistFiles.cmake @@ -43,7 +43,6 @@ SET(COPY_FROM_BUILD doc/gnucash.1 libgnucash/app-utils/swig-app-utils-guile.c libgnucash/app-utils/swig-app-utils-python.c - libgnucash/backend/xml/test/test-real-data.sh gnucash/gnucash.rc libgnucash/core-utils/gnc-vcs-info.h libgnucash/core-utils/swig-core-utils-guile.c diff --git a/libgnucash/backend/xml/test/CMakeLists.txt b/libgnucash/backend/xml/test/CMakeLists.txt index e74de225f4..0f98769e2c 100644 --- a/libgnucash/backend/xml/test/CMakeLists.txt +++ b/libgnucash/backend/xml/test/CMakeLists.txt @@ -61,15 +61,10 @@ SET_LOCAL_DIST(test_backend_xml_DIST_local CMakeLists.txt grab-types.pl test-dom-parser1.cpp test-file-stuff.cpp test-file-stuff.h test-kvp-frames.cpp test-load-backend.cpp test-load-example-account.cpp test-load-xml2.cpp test-save-in-lang.cpp test-string-converters.cpp test-xml2-is-file.cpp - test-xml-account.cpp test-real-data.sh.in test-xml-commodity.cpp + test-xml-account.cpp test-real-data.sh test-xml-commodity.cpp test-xml-pricedb.cpp test-xml-transaction.cpp) SET(test_backend_xml_DIST ${test_backend_xml_DIST_local} ${test_backend_xml_test_files_DIST} PARENT_SCOPE) -# The test test-dom-parser1.c is not run by - -# This line for autotools -CONFIGURE_FILE(test-real-data.sh.in test-real-data.sh) - ADD_XML_TEST(test-date-converting "${test_backend_xml_base_SOURCES};test-date-converting.cpp") ADD_XML_TEST(test-dom-converters1 "${test_backend_xml_base_SOURCES};test-dom-converters1.cpp") ADD_XML_TEST(test-kvp-frames "${test_backend_xml_base_SOURCES};test-kvp-frames.cpp") @@ -77,7 +72,7 @@ ADD_XML_TEST(test-load-backend test-load-backend.cpp) ADD_XML_TEST(test-load-xml2 test-load-xml2.cpp GNC_TEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/test-files/xml2 ) -# Not run in autotools. +# FIXME Why is this test not run/running ? #ADD_XML_TEST(test-save-in-lang test-save-in-lang.cpp # GNC_TEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/test-files/xml2 #) @@ -108,6 +103,6 @@ SET(test-real-data-env ) ADD_TEST(NAME test-real-data COMMAND ${CMAKE_COMMAND_TMP} - ${SHELL} ${CMAKE_CURRENT_SOURCE_DIR}/test-real-data.sh.in + ${SHELL} ${CMAKE_CURRENT_SOURCE_DIR}/test-real-data.sh ) SET_TESTS_PROPERTIES(test-real-data PROPERTIES ENVIRONMENT "${test-real-data-env}") diff --git a/libgnucash/backend/xml/test/test-real-data.sh.in b/libgnucash/backend/xml/test/test-real-data.sh similarity index 98% rename from libgnucash/backend/xml/test/test-real-data.sh.in rename to libgnucash/backend/xml/test/test-real-data.sh index 49e757b83c..de2a3473e0 100755 --- a/libgnucash/backend/xml/test/test-real-data.sh.in +++ b/libgnucash/backend/xml/test/test-real-data.sh @@ -1,4 +1,4 @@ -#!@SHELL@ +#!/bin/bash #set -e