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

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml
From:       Maks Orlovich <maksim () kde ! org>
Date:       2006-06-29 21:26:53
Message-ID: 1151616413.919534.5633.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 556307 by orlovich:

Work with paths of newer X releases. 


 M  +11 -5     test_regression.cpp  


--- branches/KDE/3.5/kdelibs/khtml/test_regression.cpp #556306:556307
@@ -31,6 +31,7 @@
 #include <signal.h>
 
 #include <kapplication.h>
+#include <kstandarddirs.h>
 #include <qimage.h>
 #include <qfile.h>
 #include "test_regression.h"
@@ -468,16 +469,21 @@
 
     if (args->isSet("xvfb"))
     {
-        if ( ::access( "/usr/X11R6/bin/Xvfb", X_OK ) ) {
-            fprintf( stderr, "ERROR: We need /usr/X11R6/bin/Xvfb to be installed for \
reliable results\n" ); +        QString xvfbPath = KStandardDirs::findExe("Xvfb");
+        if ( xvfbPath.isEmpty() ) {
+            fprintf( stderr, "ERROR: We need Xvfb to be installed for reliable \
results\n" );  exit( 1 );
         }
+        
+        QCString xvfbPath8 = QFile::encodeName(xvfbPath);
 
         xvfb = fork();
         if ( !xvfb ) {
-            char buffer[1000];
-            sprintf( buffer, \
"%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:un \
scaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/X11/misc,/usr/share/fonts/X11/75dpi:unscaled,/usr/share/fonts/X11/Type1", \
                (const char *)baseDir );
-            execl( "/usr/X11R6/bin/Xvfb", "/usr/X11R6/bin/Xvfb", "-once", "-dpi", \
"100", "-screen", "0", "1024x768x16", "-ac", "-fp", buffer, ":47", (char*)NULL ); +   \
char buffer[2000]; +            sprintf( buffer, \
"%s/resources,/usr/X11R6/lib/X11/fonts/75dpi:unscaled,/usr/X11R6/lib/X11/fonts/misc:un \
scaled,/usr/X11R6/lib/X11/fonts/Type1,/usr/share/fonts/X11/misc,/usr/share/fonts/X11/75dpi:unscaled,/usr/share/fonts/X11/Type1,"
 +            "/usr/lib/X11/fonts/75dpi:unscaled,/usr/lib/X11/fonts/misc:unscaled,/usr/lib/X11/fonts/Type1",
 +             (const char *)baseDir );
+            execl( xvfbPath8.data(), xvfbPath8.data(), "-once", "-dpi", "100", \
"-screen", "0", "1024x768x16", "-ac", "-fp", buffer, ":47", (char*)NULL );  }
 
         setenv( "DISPLAY", ":47", 1 );


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