0
0
mirror of https://github.com/rbock/sqlpp11.git synced 2024-11-16 12:51:13 +08:00

ctest -R ddl2cpp --output-on-failure, fixed

This commit is contained in:
strangeqargo 2016-06-11 16:02:54 +03:00
parent 2da5e76d3a
commit f61475e636

View File

@ -7,18 +7,18 @@
#include <fstream> #include <fstream>
int testSqlFile(const int expectedResult , const std::string pathToSqlFile ){ int testSqlFile(const std::string pathToSqlFile ){
#if defined _WIN64 || defined _WIN32 #if defined _WIN64 || defined _WIN32
std::string nullOutput = " > nul 2>&1"; std::string nullOutput = " > nul 2>&1";
#else #else
std::string nullOutput = " > /dev/null 2>&1"; std::string nullOutput = " > /dev/null 2>&1";
#endif #endif
nullOutput = "";
std::string ddlHeaderPath = "test_scripts/ddl2cpp_test_result_header"; std::string ddlHeaderPath = "../test_scripts/ddl2cpp_test_result_header";
std::string args = std::string args =
" scripts/ddl2cpp -fail-on-parse " + " ../scripts/ddl2cpp -fail-on-parse " +
pathToSqlFile + " " + pathToSqlFile + " " +
ddlHeaderPath + ddlHeaderPath +
" ddlcpp2_test_namespace "+ " ddlcpp2_test_namespace "+
@ -31,15 +31,15 @@ int testSqlFile(const int expectedResult , const std::string pathToSqlFile ){
int ddl2cpp(int, char* []) int ddl2cpp(int, char* [])
{ {
std::ifstream file("scripts/ddl2cpp"); std::ifstream file("../scripts/ddl2cpp");
if (!file) if (!file)
{ {
std::cout << "script tests should be started from the top level sqlpp11 directory. Where scripts/ dir is found\n"; std::cout << "script tests should be started from the test_scripts directory.\n";
exit(1); exit(1);
} }
assert(testSqlFile (0, "test_scripts/ddl2cpp_sample_good.sql") == 0); assert(0 == testSqlFile ("../test_scripts/ddl2cpp_sample_good.sql"));
assert(testSqlFile (0, "test_scripts/ddl2cpp_sample_bad.sql") > 0); assert(0 < testSqlFile ("../test_scripts/ddl2cpp_sample_bad.sql"));
/* maybe todo 1: test compile / use db_mock, for now we're just checking that ddl2cpp generates header without errors /* maybe todo 1: test compile / use db_mock, for now we're just checking that ddl2cpp generates header without errors
*/ */