rpms/bltk/devel bltk-1.0.9-all.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 bltk.spec, 1.2, 1.3 sources, 1.2, 1.3 bltk-1.0.8-all.patch, 1.2, NONE
Jiri Skala
jskala at fedoraproject.org
Tue Jul 14 10:28:08 UTC 2009
Author: jskala
Update of /cvs/extras/rpms/bltk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21677
Modified Files:
.cvsignore bltk.spec sources
Added Files:
bltk-1.0.9-all.patch
Removed Files:
bltk-1.0.8-all.patch
Log Message:
* Tue Jul 14 2009 Jiri Skala <jskala at redhat.com> 1.0.9-1
- merged with latest upstream sources
bltk-1.0.9-all.patch:
--- NEW FILE bltk-1.0.9-all.patch ---
--- orig-1.0.9/tools/bltk/main.c 2009-04-10 09:14:20.000000000 +0200
+++ curr-1.0.9/tools/bltk/main.c 2009-07-13 15:39:08.302608302 +0200
@@ -57,6 +57,7 @@
#include <ctype.h>
#include "bltk.h"
+#include "parseconf.h"
#define OUTPUT_CONSOLE 10
#define OUTPUT_FILE 20
@@ -206,6 +207,7 @@
char *bltk_dirname = NULL;
char bltk_root[STR_LEN];
+//char bltk_home[STR_LEN];
char bltk_extern[STR_LEN];
char *workload = NULL;
@@ -328,6 +330,7 @@
static void get_info(int no);
static int sig_abort_flg = 0;
+static int sig_hup_flg = 0;
static int help_cnt = 0;
static int version_flg = 0;
@@ -539,7 +542,16 @@
turn_off_stat_memory();
if (sig == SIGHUP) {
- set_signal(SIGHUP);
+ create_stop_file();
+/* if (!stat_log_proc_flg) {
+ create_stop_file();
+ save_sys_info_2();
+ sig_hup_flg = 1;
+ sync();
+ if (pid_stat_log != EMPTY_VALUE)
+ (void)kill(pid_stat_log, SIGHUP);
+ }
+ prog_exit(0);*/
return;
}
@@ -960,12 +972,13 @@
char str[STR_LEN];
int ret, i;
- (void)unlink(LAST_RESULTS);
- ret = symlink(results, LAST_RESULTS);
+ sprintf(str, "%s/%s", bltk_home, LAST_RESULTS);
+ (void)unlink(str);
+ ret = symlink(results, str);
if (ret != 0) {
(void)sprintf(prt_str, "symlink(%s, %s) failed, "
"errno %d (%s)\n",
- results, LAST_RESULTS, errno, strerror(errno));
+ results, str, errno, strerror(errno));
write_to_err_log(prt_str);
prog_exit(1);
}
@@ -987,6 +1000,7 @@
(void)sprintf(fail_fname, "%s/fail", results);
(void)sprintf(pass_fname, "%s/pass", results);
prog_putenv("BLTK_FAIL_FNAME", fail_fname);
+ prog_putenv("BLTK_STOP_FNAME", stop_fname);
prog_putenv("BLTK_PASS_FNAME", pass_fname);
(void)sprintf(err_log_fname, "%s/err.log", results);
@@ -1041,10 +1055,12 @@
}
(void)strcat(cmdline, "'");
- (void)sprintf(cmd, "%s >>history", cmdline);
+ sprintf(str, "%s/%s", bltk_home, HISTORY);
+ (void)sprintf(cmd, "%s >>%s", cmdline, str);
(void)prog_system(cmd);
- (void)sprintf(cmd, "%s >last_cmd", cmdline);
+ sprintf(str, "%s/%s", bltk_home, LAST_CMD);
+ (void)sprintf(cmd, "%s >%s", cmdline, str);
(void)prog_system(cmd);
(void)sprintf(cmd, "%s >%s/cmd", cmdline, results);
@@ -1078,7 +1094,7 @@
set_signal(SIGUSR2);
set_signal(SIGHUP);
- (void)sprintf(cmd, "mkdir -p -m 0777 %s/tmp", bltk_root);
+ (void)sprintf(cmd, "mkdir -p -m 0777 %s/tmp", bltk_home);
ret = prog_system(cmd);
if (ret != 0) {
(void)sprintf(prt_str, "%s failed\n", cmd);
@@ -1608,6 +1624,28 @@
return (wp1);
}
+static char *get_bltk_root_by_proc()
+{
+ char str[256], *path, *ret=NULL;
+
+ snprintf(str, sizeof str, "/proc/%d/exe", getpid());
+ if (readlink(str, str, sizeof str) > -1)
+ {
+ if ((path = dirname(str)))
+ {
+ // take one folder higher
+ ret = strrchr(path, '/');
+ if (ret != NULL)
+ {
+ *ret = 0;
+ ret = path;
+ }
+ }
+ }
+
+ return ret ? strdup(ret) : ret;
+}
+
static char *get_bltk_root_by_path(char *argv0)
{
char *path, *dpath, *res;
@@ -1648,7 +1686,8 @@
int ret;
char cwd[STR_LEN];
- wp1 = check_bltk_root(".");
+ //wp1 = check_bltk_root(".");
+ wp1 = get_bltk_root_by_proc();
if (wp1 == NULL) {
wp1 = get_bltk_root_by_argv0(argv0);
}
@@ -1792,6 +1831,12 @@
(void)umask(0);
(void)set_path(0);
+ param_init();
+
+ prog_putenv("BLTK_HOME", bltk_home);
+ prog_putenv("WL_OFFICE_WORKING_DIR", wl_office_working_dir);
+ prog_putenv("WL_READER_WORKING_DIR", wl_office_working_dir);
+
time_start = time_prev = prog_time();
(void)prog_system("xset dpms 0 0 0 >/dev/null 2>&1");
@@ -2125,7 +2170,7 @@
("getcwd() failed, cannot continue the test\n");
prog_exit(1);
}
- (void)sprintf(results_str, "%s/%s", results_parent, results);
+ (void)sprintf(results_str, "%s/%s", bltk_home, results);
results = results_str;
}
--- orig-1.0.9/tools/bltk/parseconf.c 1970-01-01 01:00:00.000000000 +0100
+++ curr-1.0.9/tools/bltk/parseconf.c 2009-07-13 10:04:45.480608150 +0200
@@ -0,0 +1,299 @@
+/*
+ * Copyright (c) 2009 Red Hat Inc.
+ * Copyright (c) 2009 Jiri Skala <jskala at redhat.com>
+ * All rights reserved.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Intel Corporation nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
[...1940 lines suppressed...]
+++ curr-1.0.9/wl_office/scen 2009-07-13 10:04:45.497608395 +0200
@@ -20,9 +20,8 @@
PRESSKEY 0 2 3000 Return
DELAY 0 0 3000 0
-#PRESSKEY A 0 1000 e
-#PRESSKEY 0 11 150 Down
-PRESSKEY C 0 1000 f
+PRESSKEY A 0 1000 e
+PRESSKEY 0 0 150 f
DELAY 0 0 2000 0
PRESSKEY 0 0 2000 Return
@@ -35,7 +34,7 @@
DELAY 0 0 2000 0
PRESSKEY A 0 3000 l
-SETWINDOW 0 0 0 \"OpenOffice.org 3.0 \":
+SETWINDOW 0 0 0 \"OpenOffice.org .* \":
FOCUSIN 0 0 150 0
DELAY 0 0 3000 0
@@ -43,7 +42,7 @@
RELEASEKEY 0 0 1000 Return
DELAY 0 0 2000 0
-ENDWINDOW 0 0 0 \"OpenOffice.org 3.0 \":
+ENDWINDOW 0 0 0 \"OpenOffice.org .* \":
SETWINDOW 0 0 0 Find & Replace
@@ -63,14 +62,12 @@
PRESSKEY 0 2 3000 Return
DELAY 0 0 3000 0
-#PRESSKEY A 0 1000 f
-#PRESSKEY 0 4 150 Down
-PRESSKEY C 0 1000 s
+PRESSKEY A 0 1000 f
+PRESSKEY 0 0 150 s
DELAY 0 0 2000 0
PRESSKEY A 0 1000 f
-PRESSKEY 0 18 150 Down
+PRESSKEY 0 0 150 x
DELAY 0 0 3000 0
-PRESSKEY 0 0 6000 Return
ENDWINDOW 0 0 0 OOWRITER_FILE.odt
@@ -156,14 +153,13 @@
TYPETEXT 0 0 150 Total Pays
DELAY 0 0 3000 0
-#PRESSKEY A 0 1000 f
-#PRESSKEY 0 4 150 Down
-PRESSKEY C 0 1000 s
+PRESSKEY A 0 1000 f
+PRESSKEY 0 0 150 s
DELAY 0 0 2000 0
+DELAY 0 0 3000 0
PRESSKEY A 0 1000 f
-PRESSKEY 0 18 150 Down
+PRESSKEY 0 0 150 x
DELAY 0 0 3000 0
-PRESSKEY 0 0 5000 Return
ENDWINDOW 0 0 0 OOCALC_FILE.ods
@@ -187,7 +183,7 @@
PRESSKEY 0 0 1000 Tab
PRESSKEY A 0 1000 e
-PRESSKEY 0 5 150 Down
+PRESSKEY 0 0 150 e
DELAY 0 0 1000 0
PRESSKEY 0 0 500 Return
@@ -224,116 +220,27 @@
DELAY 0 0 3000 0
PRESSKEY A 0 1000 v
-DELAY 0 0 2000 0
-PRESSKEY 0 0 1000 z
-PRESSKEY 0 0 500 Return
+PRESSKEY 0 0 500 z
-SETWINDOW 0 0 0 Zoom & View Layout
+SETWINDOW 0 0 0 Zoom
FOCUSIN 0 0 150 0
DELAY 0 0 1000 0
PRESSKEY S 5 150 Right
-TYPETEXT 0 0 150 150
+TYPETEXT 0 0 150 100
PRESSKEY 0 0 500 Return
-RELEASEKEY 0 0 1000 Return
+RELEASEKEY 0 0 500 Return
-ENDWINDOW 0 0 0 Zoom & View Layout
+ENDWINDOW 0 0 0 Zoom
SETWINDOW 0 0 0 OODRAW_FILE.odg
FOCUSIN 0 0 150 0
DELAY 0 0 2000 0
-PRESSKEY A 0 1000 i
-PRESSKEY 0 0 150 o
-DELAY 0 0 1000 0
-PRESSKEY 0 0 150 o
-DELAY 0 0 1000 0
-PRESSKEY 0 1 500 Return
-
-SETWINDOW 0 0 0 Insert OLE Object
-
-FOCUSIN 0 0 150 0
-PRESSKEY 0 0 500 Return
-RELEASEKEY 0 0 1000 Return
-
-ENDWINDOW 0 0 0 Insert OLE Object
-
-SETWINDOW 0 0 0 OODRAW_FILE.odg
-
-FOCUSIN 0 0 150 0
-TYPETEXT 0 0 150 Name
-PRESSKEY 0 0 1000 Right
-TYPETEXT 0 0 150 Workdays
-PRESSKEY 0 0 1000 Right
-TYPETEXT 0 0 150 Pay Rate
-PRESSKEY 0 0 1000 Right
-TYPETEXT 0 0 150 Salary
-PRESSKEY 0 0 1000 Down
-PRESSKEY 0 3 500 Left
-
-DELAY 0 0 3000 0
-TYPETEXT 0 0 150 John
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 Jane
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 Sam
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 Sarah
-PRESSKEY 0 0 1000 Right
-PRESSKEY 0 3 500 Up
-
-DELAY 0 0 3000 0
-TYPETEXT 0 0 150 12
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 20
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 15
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 10
-PRESSKEY 0 0 1000 Right
-PRESSKEY 0 3 500 Up
-
-DELAY 0 0 3000 0
-TYPETEXT 0 0 150 25
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 20
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 25
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 150 40
-PRESSKEY 0 0 1000 Right
-PRESSKEY 0 3 500 Up
-
-DELAY 0 0 3000 0
-TYPETEXT 0 0 300 =b2*c2
-DELAY 0 0 1000 0
-PRESSKEY 0 0 1000 Return
-PRESSKEY 0 0 1000 Up
-PRESSKEY C 0 1000 c
-PRESSKEY 0 0 200 Down
-PRESSKEY S 2 500 Down
-PRESSKEY C 0 1000 v
-
-DELAY 0 0 3000 0
-PRESSKEY 0 0 1000 Down
-TYPETEXT 0 0 300 =sum(
-PRESSKEY 0 0 500 Up
-PRESSKEY S 3 500 Up
-TYPETEXT 0 0 500 )
-DELAY 0 0 1000 0
-PRESSKEY 0 0 1000 Return
-
-DELAY 0 0 3000 0
-PRESSKEY 0 0 1000 Left
-PRESSKEY 0 0 1000 Up
-TYPETEXT 0 0 150 Total Pays
-
-DELAY 0 0 3000 0
-PRESSKEY 0 3 3000 Esc
PRESSKEY A 0 1000 f
PRESSKEY 0 0 150 s
-DELAY 0 0 3000 0
+DELAY 0 0 2000 0
PRESSKEY A 0 1000 f
PRESSKEY 0 0 150 x
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 4 Mar 2009 08:51:16 -0000 1.2
+++ .cvsignore 14 Jul 2009 10:27:37 -0000 1.3
@@ -1 +1 @@
-bltk-1.0.8.tar.gz
+bltk-1.0.9.tar.gz
Index: bltk.spec
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/bltk.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- bltk.spec 10 Apr 2009 13:20:48 -0000 1.2
+++ bltk.spec 14 Jul 2009 10:27:38 -0000 1.3
@@ -1,6 +1,6 @@
-Name: bltk
-Version: 1.0.8
-Release: 2%{?dist}
+Name: bltk
+Version: 1.0.9
+Release: 1%{?dist}
Summary: The BLTK measures notebook battery life under any workload
Group: Applications/System
@@ -12,7 +12,7 @@ Source2: OOCALC_FILE_SAMPLE.ods
Source3: OODRAW_FILE_SAMPLE.odg
Source4: OOWRITER_FILE_SAMPLE.odt
-Patch0: bltk-1.0.8-all.patch
+Patch0: bltk-1.0.9-all.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -194,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/bltk/wl_reader/war_and_peace.html
%changelog
+* Tue Jul 14 2009 Jiri Skala <jskala at redhat.com> 1.0.9-1
+- merged with latest upstream sources
+
* Fri Apr 10 2009 Jiri Skala <jskala at redhat.com> 1.0.8-2
- optimized bltk.conf - SOFFICE_PROG
- fixed working dir in reports
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bltk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 4 Mar 2009 08:51:16 -0000 1.2
+++ sources 14 Jul 2009 10:27:38 -0000 1.3
@@ -1 +1 @@
-790f76ec479abb166b4c5fcb98106d87 bltk-1.0.8.tar.gz
+d4b3d79cd6ff11fa1fcd8a4abcdb6882 bltk-1.0.9.tar.gz
--- bltk-1.0.8-all.patch DELETED ---
More information about the fedora-extras-commits
mailing list