[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/khtml-svg
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2006-04-03 21:16:02
Message-ID: 1144098962.114075.7823.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 526101 by wildfox:

Fix testregressiongui for cmake. Thanks Germain for the notification!
(FYI I missed the mail from 21.03, otherwhise I would have done earlier...)

CCMAIL: Germain Garand <germain@ebooksfrance.com>


 M  +4 -12     test_regression_gui_window.cpp  


--- branches/work/khtml-svg/test_regression_gui_window.cpp #526100:526101
@@ -249,7 +249,7 @@
 
 	if(!m_khtmlUrl.isEmpty())
 	{
-		const char *subdirs[] = { "css", "dom", "xml", "html" }; // That's enough ;-)
+		const char *subdirs[] = { "css", "dom", "ecma", "java" }; // That's enough ;-)
 		for(int i = 0; i <= 3; i++)
 		{
 			QFileInfo sourceDir(m_khtmlUrl.path() + "/" + subdirs[i]);
@@ -652,20 +652,12 @@
 	QStringList environment = QProcess::systemEnvironment();
 	environment << "KDE_DEBUG=false"; // No Dr. Konqi please!
 
-	QString program = m_khtmlUrl.path() + "/.libs/testregression";
-	QString program2 = m_khtmlUrl.path() + "/testregression"; // with CMake, it's in $buildir/bin
+	QString program = m_khtmlUrl.path() + "/../bin/testregression";
 
 	if(!QFileInfo(program).exists())
 	{
-		if(!QFileInfo(program2).exists())
-		{
-			KMessageBox::error(0, i18n("Can't find testregression executable!"));
-			return;
-		} 
-		else
-		{
-			program = program2;
-		}
+		KMessageBox::error(0, i18n("Can't find testregression executable!"));
+		return;
 	}
 
 	QStringList arguments;
[prev in list] [next in list] [prev in thread] [next in thread]