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

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 9/23/14 11:49

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Tue 9/23/14 11:49
Michael Larabel  
pts-core: Couple small... 
Mon 9/22/14 16:14
Michael Larabel  
pts-core: Missing file... 
Mon 9/22/14 15:24
Michael Larabel  
Bump PTS_CORE_VERSION... 
Mon 9/22/14 15:02
Michael Larabel  
pts-core: Allow Phoronix... 
Mon 9/22/14 13:23
Michael Larabel  
pts-core: Convert to a... 
Mon 9/22/14 10:15
Michael Larabel  
pts-core: Add "failed to... 
 
> --git a/TODO b/TODO
index a88e298
..0874dc4 100644
--- a/TODO
+++ b/TODO
@@ -10,+10,@@
     - 
i.e. if EIST Cool n Quiet are enabled
 
Choice of SH or PHP for all install scripts
 
PossiblePaths to support multiple possible install locationsseparated by delimiter.
-- 
pts/pts-functions-run.phpMerge common areas of pts_run_benchmark() and run_gtk_benchmark().
 - Use new (
largerWav file for benchmarks... internal Phoronix WAV file used is copyrighted musicCurrent PTS One is too small for reliable results.
 - 
Improved hardware detection (i.erecognize multiple graphics cards)
 - 
Change all the echos to fwrite with using STDOUT or STDERR where relevant
diff 
--git a/phoronix-test-suite b/phoronix-test-suite
index f78b095
..67826df 100755
--- a/phoronix-test-suite
+++ b/phoronix-test-suite
@@ -57,10 +57,10 @@ case "${task}in
     
;;
 *)
     echo 
"\n================================="
-    echo "Phoronix Test Suite Arguments"
+    echo "Phoronix Test Suite"
     
echo "http://www.phoronix-test-suite.com/"
     
echo "=================================\n"
-    echo "gui: Launch The Phoronix Test Suite GUI"
+#    echo "gui: Launch The Phoronix Test Suite GUI"
     
echo "install <suite OR benchmark>: Install or Update The Specified Benchmark(s)"
     
echo "run <suite OR benchmark>: Run The Specified Benchmark/Suite"
     
echo "benchmark <suite OR benchmark OR saved file>: Same as manually running install and then run"
diff --git a/pts-core/functions/pts-functions-gtk.php b/pts-core/functions/pts-functions-gtk.php
deleted file mode 100644
index 9ec1965
..0000000
--- a/pts-core/functions/pts-functions-gtk.php
+++ /dev/null
@@ -1,54 +0,@@
-<?
php
-
-function 
gtk_shutdown()
-{
-    
gtk::main_quit();
-}
-function 
gtk_quick_alert($message)
-{
-    
$dialog = new GtkDialog("Phoronix Test Suite"nullGtk::DIALOG_MODAL);
-    
$dialog->set_size_request(250, -1);
-    
$box $dialog->vbox;
-    
$box->pack_start($hbox = new GtkHBox());
-    
$message_label = new GtkLabel($message);
-    
$message_label->set_size_request(230, -1);
-    
$message_label->set_line_wrap(true);
-    
$hbox->pack_start($message_label);
-    
$dialog->add_button(Gtk::STOCK_OKGtk::RESPONSE_OK);
-    
$dialog->show_all();
-    
$dialog->run();
-    
$dialog->destroy();
-}
-function 
gtk_benchmark_results($message)
-{
-    
$dialog = new GtkDialog("Phoronix Test Suite"nullGtk::DIALOG_MODAL);
-    
$dialog->set_size_request(500, -1);
-    
$box $dialog->vbox;
-    
$box->pack_start($hbox = new GtkHBox());
-    
$message_label = new GtkLabel($message);
-    
$message_label->set_size_request(460, -1);
-    
$message_label->set_line_wrap(true);
-    
$hbox->pack_start($message_label);
-    
$dialog->add_button(Gtk::STOCK_OKGtk::RESPONSE_OK);
-    
$dialog->show_all();
-    
$dialog->run();
-    
$dialog->destroy();
-}
-function 
combobox_select(&$button$combobox)
-{
-    
$model $combobox->get_model();
-    
$selection $model->get_value($combobox->get_active_iter(), 0);
-    
$benchmark pts_benchmark_name_to_identifier($selection);
-
-    if(!
$benchmark)
-    {
-        
gtk_quick_alert("No benchmark selected!");
-    }
-    else
-    {
-        echo 
exec("php pts-core/pts-benchmark-screen.php " $benchmark);
-    }
-
-}
-
-
?>
diff --git a/pts-core/pts-benchmark-screen.php b/pts-core/pts-benchmark-screen.php
deleted file mode 100644
index 1af49bb..0000000
--- a/pts-core/pts-benchmark-screen.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-if(!
extension_loaded("gtk"))
-    
dl("php_gtk2.so");
-
-require(
"pts-core/functions/pts-functions.php");
-require(
"pts-core/functions/pts-functions-gtk.php");
-require(
"pts-core/functions/pts-functions-run.php");
-
-
$BENCHMARK_IDENTIFIER $argv[1];
-
$BENCHMARK_OPTIONS = array();
-
-if(empty(
$BENCHMARK_IDENTIFIER))
-    exit;
-
-
$BENCHMARK_NAME pts_benchmark_identifier_to_name($BENCHMARK_IDENTIFIER);
-
-if(empty(
$BENCHMARK_NAME))
-    exit;
-
-
// Prepare The Parser
-$BENCHMARK_XML = new tandem_XmlReader(file_get_contents(XML_PROFILE_LOCATION "$BENCHMARK_IDENTIFIER.xml"));
-
-
$window = new GtkWindow();
-
$window->set_title("Phoronix Test Suite - " $BENCHMARK_NAME);
-
$window->set_border_width(10);
-
$window->connect_simple("destroy""gtk_shutdown");
-
$window->set_size_request(500, -1);
-
-
$window->add($vbox = new GtkVBox());
-
-
$pts_title = new GtkLabel("Phoronix Test Suite");
-
$pts_title->modify_font(new PangoFontDescription("FreeSans 21"));
-
$pts_title->modify_fg(Gtk::STATE_NORMALGdkColor::parse("#2b6b29"));
-
$pts_title->set_size_request(-140);
-
$vbox->pack_start($pts_title00);
-
-
$pts_benchmark_title = new GtkLabel($BENCHMARK_NAME);
-
$pts_benchmark_title->modify_font(new PangoFontDescription("FreeSans 16"));
-
$pts_benchmark_title->modify_fg(Gtk::STATE_NORMALGdkColor::parse("#AE0000"));
-
$pts_benchmark_title->set_size_request(-124);
-
$vbox->pack_start($pts_benchmark_title00);
-
-
// Select Benchmark Row
-$benchmark_settings_name $BENCHMARK_XML->getXMLArrayValues("PTSBenchmark/Settings/Option/DisplayName");
-
$benchmark_settings_argument $BENCHMARK_XML->getXMLArrayValues("PTSBenchmark/Settings/Option/ArgumentName");
-
$benchmark_settings_identifier $BENCHMARK_XML->getXMLArrayValues("PTSBenchmark/Settings/Option/Identifier");
-
$benchmark_settings_menu $BENCHMARK_XML->getXMLArrayValues("PTSBenchmark/Settings/Option/Menu");
-
-
$hbox = array();
-for(
$option_count 0$option_count sizeof($benchmark_settings_name); $option_count++)
-{
-    
$this_identifier $benchmark_settings_identifier[$option_count];
-    
$hbox[$option_count] = new GtkHBox();
-    
$hbox[$option_count]->pack_start(new GtkLabel($benchmark_settings_name[$option_count] . ": "), 00);
-    
$hbox[$option_count]->pack_start(new GtkLabel(" "), 00);
-
-    if(
strlen($benchmark_settings_menu[$option_count]) > 6)
-    {
-        
$xml_parser = new tandem_XmlReader($benchmark_settings_menu[$option_count]);
-        
$menu_option_names $xml_parser->getXMLArrayValues("Entry/Name");
-
-        
// Benchmark Selection GtkComboBox
-        $$this_identifier = new GtkComboBox();
-        
$list_model = new GtkListStore(Gtk::TYPE_STRING);
-        $
$this_identifier->set_model($list_model);
-        
$cell_renderer = new GtkCellRendererText();
-        $
$this_identifier->pack_start($cell_renderer);
-        $
$this_identifier->set_attributes($cell_renderer"text"0);
-
-        
// Load Up Benchmark List
-        foreach($menu_option_names as $menu_item)
-        {
-            
$list_model->append(array($menu_item));
-        }
-
-        
// Display
-        $hbox[$option_count]->pack_start($$this_identifier00);
-    }
-    else
-    {
-
-        $
$this_identifier = new GtkTextView();
-        
$buffer[$option_count] = new GtkTextBuffer();
-        $
$this_identifier->set_buffer($buffer[$option_count]);
-        $
$this_identifier->set_size_request(120, -1);
-
-        
// Display
-        $hbox[$option_count]->pack_start($$this_identifier00);
-    }
-
-    
$vbox->pack_start($hbox[$option_count], 00);
-    
$vbox->pack_start(new GtkLabel(" "), 00);
-
-    
array_push($BENCHMARK_OPTIONS$this_identifier);
-}
-
-
$vbox->pack_start(new GtkLabel(" "), 00);
-
-
$submit_button = new GtkButton("Run Benchmark");
-
$submit_button->set_size_request(12828);
-
$submit_button->connect("clicked""run_gtk_benchmark");
-
$vbox->pack_start($submit_button00);
-
-
$window->show_all();
-
Gtk::main();
-
?>
diff --git a/pts-core/pts-main.php b/pts-core/pts-main.php
deleted file mode 100644
index b99a94a..0000000
--- a/pts-core/pts-main.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-
/*
-   Copyright (C) 2008, Michael Larabel.
-   Copyright (C) 2008, Phoronix Media.
-
-   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
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-if(!
extension_loaded("gtk"))
-    
dl("php_gtk2.so");
-
-require(
"pts-core/functions/pts-functions.php");
-require(
"pts-core/functions/pts-functions-gtk.php");
-
-
$window = new GtkWindow();
-
$window->set_title("Phoronix Test Suite");
-
$window->set_border_width(10);
-
$window->connect_simple("destroy""gtk_shutdown");
-
$window->set_size_request(450, -1);
-
-
$window->add($vbox = new GtkVBox());
-
-
$pts_title = new GtkLabel("Phoronix Test Suite");
-
$pts_title->modify_font(new PangoFontDescription("FreeSans 21"));
-
$pts_title->modify_fg(Gtk::STATE_NORMALGdkColor::parse("#2b6b29"));
-
$pts_title->set_size_request(-160);
-
$vbox->pack_start($pts_title00);
-
-
$vbox->pack_start($hbox = new GtkHBox(), 00);
-
-
// Select Benchmark Row
-$hbox->pack_start(new GtkLabel("Benchmark: "), 00);
-
-
// Benchmark Selection GtkComboBox
-$benchmark_combobox = new GtkComboBox();
-
$list_model = new GtkListStore(Gtk::TYPE_STRING);
-
$benchmark_combobox->set_model($list_model);
-
$cell_renderer = new GtkCellRendererText();
-
$benchmark_combobox->pack_start($cell_renderer);
-
$benchmark_combobox->set_attributes($cell_renderer"text"0);
-
-
// Load Up Benchmark List
-foreach(pts_benchmark_names_to_array() as $menu_item)
-{
-    
$list_model->append(array($menu_item));
-}
-
-
// Display
-$hbox->pack_start($benchmark_combobox00);
-
$hbox->pack_start(new GtkLabel(" "), 00);
-
-
$submit_button = new GtkButton("Submit");
-
$submit_button->set_size_request(7428);
-
$submit_button->connect("clicked""combobox_select"$benchmark_combobox);
-
$hbox->pack_start($submit_button00);
-
-
$vbox->pack_start(new GtkLabel(" "), 00);
-
-
$pts_desc = new GtkLabel("Select the benchmark you would like to run. The application must be installed prior to running the Phoronix Test Suite. Any requests or issues can be addressed in the Phoronix Forums.");
-
$pts_desc->set_size_request(430, -1);
-
$pts_desc->set_line_wrap(true);
-
$vbox->pack_start($pts_desc00);
-
-
$vbox->pack_start(new GtkLabel(" "), 00);
-
-
$pts_link = new GtkLabel("www.phoronix.com");
-
$pts_link->modify_font(new PangoFontDescription("FreeSans 14"));
-
$pts_link->modify_fg(Gtk::STATE_NORMALGdkColor::parse("#2b6b29"));
-
$pts_link->set_size_request(-130);
-
$vbox->pack_start($pts_link00);
-
-
$window->show_all();
-
Gtk::main();
-
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media