projects / phoronix-test-suite.git / commitdiff
Build Results
 
Summary

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 5/21/13 15:49

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Tue 5/21/13 15:49
Michael Larabel  
Phoronix Test Suite... 
Fri 5/17/13 22:52
Michael Larabel  
phodevi: Report CPU... 
Wed 5/15/13 21:50
Michael Larabel  
Phoronix Test Suite... 
Wed 5/15/13 21:39
Michael Larabel  
pts-core: DragonFlyBSD... 
Wed 5/15/13 15:47
Michael Larabel  
pts-core: Updates from... 
Wed 5/15/13 15:43
Michael Larabel  
 
 
> --git a/pts-core/objects/client/pts_argument_check.php b/pts-core/objects/client/pts_argument_check.php
index 1fc6b7e
..ddd7779 100644
--- a/pts-core/objects/client/pts_argument_check.php
+++ b/pts-core/objects/client/pts_argument_check.php
@@ -3,+3,@@
 
/*
     Phoronix Test Suite
     URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-    Copyright (C) 2009 - 2011, Phoronix Media
-    Copyright (C) 2009 - 2011, Michael Larabel
+    Copyright (C) 2009 - 2012, Phoronix Media
+    Copyright (C) 2009 - 2012, Michael Larabel

     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -68,7 +68,7 @@ class pts_argument_check
         }
         else if($this->get_function_check() == array('pts_openbenchmarking', 'is_openbenchmarking_result_id'))
         {
-            $type = 'OpenBenchmarking.org ID';
+            $type = 'OpenBenchmarking ID';
         }
         else if($this->get_function_check() == array('pts_result_file', 'is_test_result_file'))
         {
diff --git a/pts-core/objects/client/pts_client.php b/pts-core/objects/client/pts_client.php
index b622126..df07220 100644
--- a/pts-core/objects/client/pts_client.php
+++ b/pts-core/objects/client/pts_client.php
@@ -1219,7 +1219,7 @@ class pts_client
                         pts_client::$display->generic_error('Argument Missing.');
                     }

-                    echo 'CORRECT SYNTAX' . PHP_EOL . 'phoronix-test-suite ' . str_replace('_', '-', $command_alias) . ' ' . implode(' ', $argument_checks) . PHP_EOL . PHP_EOL;
+                    echo 'CORRECT SYNTAX:' . PHP_EOL . 'phoronix-test-suite ' . str_replace('_', '-', $command_alias) . ' ' . implode(' ', $argument_checks) . PHP_EOL . PHP_EOL;

                     if(method_exists($command, 'invalid_command'))
                     {
diff --git a/pts-core/objects/client/pts_tests.php b/pts-core/objects/client/pts_tests.php
index e3e5ae2..57bfe74 100644
--- a/pts-core/objects/client/pts_tests.php
+++ b/pts-core/objects/client/pts_tests.php
@@ -233,7 +233,7 @@ class pts_tests
                     // lots of tests... trim it down
                     $similar_tests = array_rand($similar_tests, 12);
                 }
-                echo pts_user_io::display_text_table($similar_tests) . PHP_EOL;
+                echo pts_user_io::display_text_table($similar_tests) . PHP_EOL . PHP_EOL;
             }
         }

diff --git a/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php b/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php
index 24b3248..493f2ab 100644
--- a/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php
+++ b/pts-core/objects/nye_Xml/pts_test_nye_XmlReader.php
@@ -100,7 +100,7 @@ class pts_test_nye_XmlReader extends nye_XmlReader

         if(!empty($test_extends))
         {
-            $test_extends = pts_openbenchmarking::evaluate_string_to_qualifier($test_extends);
+            $test_extends = pts_openbenchmarking::evaluate_string_to_qualifier($test_extends, true, 'test');
             $test_below_parser = new pts_test_nye_XmlReader($test_extends);
             $test_below_tag = $test_below_parser->getXMLValue($xml_tag);

diff --git a/pts-core/objects/pts_test_profile_parser.php b/pts-core/objects/pts_test_profile_parser.php
index f36b061..670afa5 100644
--- a/pts-core/objects/pts_test_profile_parser.php
+++ b/pts-core/objects/pts_test_profile_parser.php
@@ -29,7 +29,7 @@ class pts_test_profile_parser
     {
         if(PTS_IS_CLIENT)
         {
-            $identifier = pts_openbenchmarking::evaluate_string_to_qualifier($identifier);
+            $identifier = pts_openbenchmarking::evaluate_string_to_qualifier($identifier, true, 'test');
         }

         $this->xml_parser = new pts_test_nye_XmlReader($identifier);
diff --git a/pts-core/objects/pts_test_suite_parser.php b/pts-core/objects/pts_test_suite_parser.php
index 12a99c1..60b905c 100644
--- a/pts-core/objects/pts_test_suite_parser.php
+++ b/pts-core/objects/pts_test_suite_parser.php
@@ -29,7 +29,7 @@ class pts_test_suite_parser
     {
         if(PTS_IS_CLIENT)
         {
-            $identifier = pts_openbenchmarking::evaluate_string_to_qualifier($identifier);
+            $identifier = pts_openbenchmarking::evaluate_string_to_qualifier($identifier, true, 'suite');
         }

         $this->identifier 
 
Phoronix.com
Linux Driver Forums
Copyright © 2013 by Phoronix Media