From e15466fc668df440a23b297f2f1123eacb8181c5 Mon Sep 17 00:00:00 2001 From: Hamed Masafi Date: Sat, 1 Aug 2020 17:43:23 +0430 Subject: [PATCH] fix: tests on windows run on sqlite --- .gitignore | 1 + tests/auto/common/consts.h | 12 ++---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a6e4445..dc2f50a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ Makefile* *.qmlproject.user.* build +build2 # KDE show hidden folder marker .directory diff --git a/tests/auto/common/consts.h b/tests/auto/common/consts.h index 9080229..6e98564 100644 --- a/tests/auto/common/consts.h +++ b/tests/auto/common/consts.h @@ -12,20 +12,12 @@ .arg(timer.elapsed() / 1000.) \ .arg(__func__) -#ifdef Q_OS_LINUX + #define DRIVER QStringLiteral("QSQLITE") -#define DATABASE QStringLiteral("/tmp/testdb.sqlite") +#define DATABASE QStringLiteral("nut_test_%1_db").arg(metaObject()->className()).toLower() #define HOST QString() #define USERNAME QString() #define PASSWORD QString() -#else -#define DRIVER "QODBC" -#define DATABASE QString("DRIVER={SQL Server};Server=.;Database=%1;Uid=sa;Port=1433;Pwd=qwe123!@#;WSID=.") \ - .arg(QString("nut_test_%1_db").arg(metaObject()->className()).toLower()) -#define HOST "127.0.0.1" -#define USERNAME "sa" -#define PASSWORD "qwe123!@#" -#endif #ifdef Q_OS_LINUX # define OS "Linux"