summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 22:21:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-03-07 22:21:31 -0600
commit06227c5420ce8eeef7bd44406a395188c61e1703 (patch)
treec18c25b31413479e63fec92f61067b95759fc3b0 /khtml
parentce5d3d7fd554b9832a69350cffa8d79c5002753e (diff)
parent70d7c59d2ac9ad3718f92a20c07937d3b6cfb928 (diff)
downloadtdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.tar.gz
tdelibs-06227c5420ce8eeef7bd44406a395188c61e1703.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'khtml')
-rw-r--r--khtml/test_regression.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index 7472eb301..069ade04f 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -481,7 +481,7 @@ int main(int argc, char *argv[])
{
TQString xvfbPath = KStandardDirs::findExe("Xvfb");
if ( xvfbPath.isEmpty() ) {
- fprintf( stderr, "ERROR: We need Xvfb to be installed for reliable results\n" );
+ fprintf( stderr, "[test_regression] ERROR: We need Xvfb to be installed for reliable results\n" );
exit( 1 );
}
@@ -578,7 +578,7 @@ int main(int argc, char *argv[])
// we're not interested
toplevel->statusBar()->hide();
- if (!getenv("KDE_DEBUG")) {
+ if (!getenv("TDE_DEBUG")) {
// set ulimits
rlimit vmem_limit = { 256*1024*1024, RLIM_INFINITY }; // 256Mb Memory should suffice
setrlimit(RLIMIT_AS, &vmem_limit);