aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2013-06-24 15:56:35 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-06-25 12:55:25 +0200
commit30e9e1c9000ebf4e1d9f3566d5c92e5ba9226ed1 (patch)
tree5a23e5eb5755e3bcacf36441bb8d8bb3ccd079f7
parente9ddf75f2d3732bfc5fc3d8268e2490754c42c61 (diff)
remove TestBlackbox::codegen
This is now tested by TestBlackbox::build_project. Change-Id: Ib64c06d10634aa2e6b5213cd9536e229cb5e3882 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp10
-rw-r--r--tests/auto/blackbox/tst_blackbox.h1
2 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 399405e8a..d8faaa07e 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -184,6 +184,9 @@ void TestBlackbox::build_project_data()
QTest::newRow("BPs in Sources")
<< QString("buildproperties_source")
<< QString(HostOsInfo::appendExecutableSuffix(buildDir + "/HelloWorld"));
+ QTest::newRow("code generator")
+ << QString("codegen")
+ << QString(HostOsInfo::appendExecutableSuffix(buildDir + "/codegen"));
QTest::newRow("link static libs")
<< QString("link_staticlib")
<< QString(buildDir + QLatin1String("/")
@@ -780,13 +783,6 @@ void TestBlackbox::ruleConditions()
QVERIFY(!QFileInfo(buildDir + "/unzorted.foo.narf.zort").exists());
}
-void TestBlackbox::codegen()
-{
- QDir::setCurrent(testDataDir + "/codegen");
- QCOMPARE(runQbs(), 0);
- QVERIFY(QFile::exists(buildDir + HostOsInfo::appendExecutableSuffix("/codegen")));
-}
-
void TestBlackbox::trackAddQObjectHeader()
{
QDir::setCurrent(testDataDir + "/missingqobjectheader");
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 455cacddc..743edc649 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -118,7 +118,6 @@ private slots:
void recursiveRenaming();
void recursiveWildcards();
void ruleConditions();
- void codegen();
void trackAddQObjectHeader();
void trackRemoveQObjectHeader();
void overrideProjectProperties();