From ee888fe03855823aee9b1289a0916876268ccc20 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Thu, 21 Oct 2004 21:59:08 +0000
Subject: [PATCH] no mem in runme_all, more ex.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4067 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 tests/unit/runme_all | 16 +---------------
 tests/unit/runme_mem | 10 ++++++++--
 tests/unit/test.php  |  1 +
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/tests/unit/runme_all b/tests/unit/runme_all
index 14f60c317..104e1748b 100755
--- a/tests/unit/runme_all
+++ b/tests/unit/runme_all
@@ -1,23 +1,9 @@
 #!/bin/sh
 # TODO: need to check write perms to the .testbox/* (mixed web/cli perms)
-# TODO: need to add the ploticus path
 
 if [ -d .testbox/page_data -a ! -w .testbox/page_data/AllPages ]; then
   rm -rf .testbox/*
 fi
-today=`date` 
-# title="cli-`echo '<?= PHP_OS,PHP_VERSION ?> | php -Cq`"
 for db in file dba SQL ADODB; do
-    php -Cq -d register_argc_argv=1 test.php level=10 db=$db | tee all_$db.result
-    ./prepare_pl $db
-    title="cli-`grep PHP_OS all_$db.result|cut -d= -f2`-`grep PHP_VERSION all_$db.result|cut -d= -f2` $today"
-    pl -png -o all_$db.png -prefab vbars data=all_$db.data delim=tab x=2 y=1 xstep=2 barwidth=line ylbl="memory (kb)" title="$db $title" xlbl="consecutive tests" stubvert=yes ygrid=yes ylbldet="adjust=-0.1,0" xlbldet="adjust=0,-1.2" # vals=yes 
-    # pl -png all_$db.ploticus -o all_$db.png
+    php -Cq -d register_argc_argv=1 test.php debug=1 level=10 db=$db | tee all_$db.result
 done
-
-./combine_pl
-# pl -png -o stack.png -prefab stack data=combined.data x=1 y=2 y2=3 y3=4 y4=5 barwidth=line ylbl="memory (kb)" title="cli-4.3.9WIN" ygrid=yes ylbldet="adjust=-0.1,0" stubvert=yes stackarea=yes name=file name2=dba name3=SQL name4=ADODB
-
-pl -png -o compare.png -prefab compare data=combined.data delim=tab catfields=1 y=3 y2=4 y3=5 y4=6 ylbl="memory (kb)" title="$title" ygrid=yes ylbldet="adjust=-0.1,0" barwidth=0.01 stubvert=yes header=yes name=file name2=dba name3=SQL name4=ADODB
-
-pl -png -o lines.png -prefab lines data=combined.data delim=tab x=2 y=3 y2=4 y3=5 y4=6 ylbl="memory (kb)" title="$title" ygrid=yes ylbldet="adjust=-0.1,0" stubvert=yes header=yes name=file name2=dba name3=SQL name4=ADODB
diff --git a/tests/unit/runme_mem b/tests/unit/runme_mem
index 857b5fef1..937fe664e 100755
--- a/tests/unit/runme_mem
+++ b/tests/unit/runme_mem
@@ -30,8 +30,14 @@ done
 # get the relevant mem numbers (testsetupwiki, test99dumphtml)
 # combine the results and display the graph
 ./combine_define.pl $prefix
-echo "" >> "${prefix}_combine_define.data"
-#pl -png -o all_$db.png -prefab vbars data=all_$db.data delim=tab x=2 y=1 xstep=2 barwidth=line ylbl="memory (kb)" title="$db $title" xlbl="consecutive tests" stubvert=yes ygrid=yes ylbldet="adjust=-0.1,0" xlbldet="adjust=0,-1.2" # vals=yes
+
+#pl -png -o all_$db.png -prefab vbars data=$prefix_all_combined.data x=2 y=1 xstep=2 barwidth=line ylbl="memory (kb)" title="$db $title" xlbl="consecutive tests" stubvert=yes ygrid=yes ylbldet="adjust=-0.1,0" xlbldet="adjust=0,-1.2" # vals=yes
+
+# pl -png -o stack.png -prefab stack data=$prefix_combined.data x=1 y=2 y2=3 y3=4 y4=5 barwidth=line ylbl="memory (kb)" title="cli-4.3.9WIN" ygrid=yes ylbldet="adjust=-0.1,0" stubvert=yes stackarea=yes name=file name2=dba name3=SQL name4=ADODB
+
+#pl -png -o compare.png -prefab compare data=$prefix_combined.data catfields=1 y=3 y2=4 y3=5 y4=6 ylbl="memory (kb)" title="$title" ygrid=yes ylbldet="adjust=-0.1,0" barwidth=0.01 stubvert=yes header=yes name=file name2=dba name3=SQL name4=ADODB
+
+#pl -png -o lines.png -prefab lines data=$prefix_combined.data x=2 y=3 y2=4 y3=5 y4=6 ylbl="memory (kb)" title="$title" ygrid=yes ylbldet="adjust=-0.1,0" stubvert=yes header=yes name=file name2=dba name3=SQL name4=ADODB
 
 
 
diff --git a/tests/unit/test.php b/tests/unit/test.php
index ef457e688..6627f5d15 100644
--- a/tests/unit/test.php
+++ b/tests/unit/test.php
@@ -297,6 +297,7 @@ if (!empty($argv)) {
     if (!empty($runtests))
         $alltests = $runtests;
     if ($debug_level & 1) {
+        echo "\n";
         echo "PHP_SAPI=",php_sapi_name(), "\n";
         echo "PHP_OS=",PHP_OS, "\n";
         echo "PHP_VERSION=",PHP_VERSION, "\n";
-- 
2.45.0