Drop the gnc-module wrapper around the test-engine library

It's not adding anything
This commit is contained in:
Geert Janssens
2020-04-24 21:29:20 +02:00
parent 03d7ae8fd0
commit abf29aa196
9 changed files with 12 additions and 79 deletions

View File

@@ -12,7 +12,7 @@ set(ENGINE_TEST_INCLUDE_DIRS
set(ENGINE_TEST_LIBS
gnc-engine
gncmod-test-engine
gnc-test-engine
test-core
gnucash-guile
${LIBXML2_LDFLAGS}

View File

@@ -26,7 +26,7 @@ set(GUILE_DEPENDS
scm-gnc-module
scm-gnome-utils
test-core
gncmod-test-engine
gnc-test-engine
gnc-app-utils
gnc-core-utils
gnc-engine

View File

@@ -10,7 +10,7 @@ set(GENERIC_IMPORT_TEST_INCLUDE_DIRS
${GUILE_INCLUDE_DIRS}
)
set(GENERIC_IMPORT_TEST_LIBS gnc-generic-import gncmod-test-engine test-core)
set(GENERIC_IMPORT_TEST_LIBS gnc-generic-import gnc-test-engine test-core)
gnc_add_test_with_guile(test-import-parse test-import-parse.c
GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS

View File

@@ -9,7 +9,7 @@ set(APP_UTILS_TEST_INCLUDE_DIRS
${GUILE_INCLUDE_DIRS}
)
set(APP_UTILS_TEST_LIBS gnc-app-utils gncmod-test-engine test-core ${GIO_LDFLAGS} ${GUILE_LDFLAGS})
set(APP_UTILS_TEST_LIBS gnc-app-utils gnc-test-engine test-core ${GIO_LDFLAGS} ${GUILE_LDFLAGS})
set(test_app_utils_SOURCES test-app-utils.c test-option-util.cpp test-gnc-ui-util.c)

View File

@@ -10,7 +10,7 @@ set(BACKEND_DBI_TEST_INCLUDE_DIRS
${LIBDBI_INCLUDE_PATH}
${GLIB2_INCLUDE_DIRS}
)
set(BACKEND_DBI_TEST_LIBS gnc-backend-sql gnc-engine gncmod-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
set(BACKEND_DBI_TEST_LIBS gnc-backend-sql gnc-engine gnc-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY})
set(test_dbi_backend_SOURCES
test-backend-dbi.cpp

View File

@@ -14,7 +14,7 @@ set(XML_TEST_INCLUDE_DIRS
)
set(XML_TEST_LIBS gnc-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz)
set(XML_TEST_LIBS gnc-engine gnc-test-engine test-core ${LIBXML2_LDFLAGS} -lz)
function(add_xml_test _TARGET _SOURCE_FILES)
gnc_add_test(${_TARGET} "${_SOURCE_FILES}" XML_TEST_INCLUDE_DIRS XML_TEST_LIBS ${ARGN})

View File

@@ -1,12 +1,12 @@
set(libgncmod_test_engine_SOURCES
gncmod-test-engine.c test-engine-stuff.cpp
set(libgnc_test_engine_SOURCES
test-engine-stuff.cpp
)
add_library(gncmod-test-engine STATIC ${libgncmod_test_engine_SOURCES})
add_library(gnc-test-engine STATIC ${libgnc_test_engine_SOURCES})
target_include_directories(gncmod-test-engine PRIVATE
target_include_directories(gnc-test-engine PRIVATE
${GMODULE_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${CMAKE_BINARY_DIR}/common # for config.h
@@ -15,5 +15,5 @@ target_include_directories(gncmod-test-engine PRIVATE
${CMAKE_SOURCE_DIR}/common/test-core
)
set_dist_list(engine_test_core_DIST CMakeLists.txt ${libgncmod_test_engine_SOURCES}
set_dist_list(engine_test_core_DIST CMakeLists.txt ${libgnc_test_engine_SOURCES}
test-engine-stuff.h test-engine-strings.h)

View File

@@ -1,67 +0,0 @@
/*********************************************************************
* gncmod-test-engine.c
* module definition/initialization for the engine test infrastructure
*
* Copyright (c) 2001 Linux Developers Group, Inc.
*********************************************************************/
/********************************************************************\
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 2 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License*
* along with this program; if not, contact: *
* *
* Free Software Foundation Voice: +1-617-542-5942 *
* 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 *
* Boston, MA 02110-1301, USA gnu@gnu.org *
* *
\********************************************************************/
#include <stdio.h>
#include <gmodule.h>
#include "gnc-module.h"
#include "gnc-module-api.h"
GNC_MODULE_API_DECL(libgncmod_test_engine)
/* version of the gnc module system interface we require */
int libgncmod_test_engine_gnc_module_system_interface = 0;
/* module versioning uses libtool semantics. */
int libgncmod_test_engine_gnc_module_current = 0;
int libgncmod_test_engine_gnc_module_revision = 0;
int libgncmod_test_engine_gnc_module_age = 0;
char *
libgncmod_test_engine_gnc_module_path(void)
{
return g_strdup("gnucash/engine/test");
}
char *
libgncmod_test_engine_gnc_module_description(void)
{
return g_strdup("GnuCash Engine test infrastructure.");
}
int
libgncmod_test_engine_gnc_module_init(int refcount)
{
return TRUE;
}
int
libgncmod_test_engine_gnc_module_end(int refcount)
{
return TRUE;
}

View File

@@ -9,7 +9,7 @@ set(ENGINE_TEST_INCLUDE_DIRS
${GLIB2_INCLUDE_DIRS}
)
set(ENGINE_TEST_LIBS gnc-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lm)
set(ENGINE_TEST_LIBS gnc-engine gnc-test-engine test-core ${LIBXML2_LDFLAGS} -lm)
macro(add_engine_test _TARGET _SOURCE_FILES)
gnc_add_test(${_TARGET} "${_SOURCE_FILES}" ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS)