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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdelibs/khtml [POSSIBLY UNSAFE]
From:       Leo Savernik <l.savernik () aon ! at>
Date:       2004-09-07 15:27:54
Message-ID: 20040907152754.C6AF0E76 () office ! kde ! org
[Download RAW message or body]

CVS commit by savernik: 

Use different temporary testregression home-directory per user.

Otherwise, running testregression under more than one user will fail for
all but the first one.

Patch from Germain Garand.
Tested by me.


  M +11 -1     test_regression.cpp   1.102.2.1 [POSSIBLY UNSAFE: printf]


--- kdelibs/khtml/test_regression.cpp  #1.102:1.102.2.1
@@ -26,5 +26,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/types.h>
 #include <unistd.h>
+#include <pwd.h>
 #include <signal.h>
 
@@ -374,5 +376,13 @@ int main(int argc, char *argv[])
 {
     // forget about any settings
-    setenv( "KDEHOME", "/var/tmp/non_existant", 1 );
+    passwd* pw = getpwuid( getuid() );
+    if (!pw) {
+        fprintf(stderr, "dang, I don't even know who I am.\n");
+        exit(1);
+    }
+        
+    QString kh("/var/tmp/%1-khtml_testregression");
+    kh = kh.arg( pw->pw_name );
+    setenv( "KDEHOME", kh.latin1(), 1 );
     setenv( "LC_ALL", "C", 1 );
     setenv( "LANG", "C", 1 );


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