Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: include by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 18 Jul 2006 00:16:09 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/tengine
Modified Files:
callbacks.c ttest.c
Log Message:
Extra functionality for ptest
Support reading of compressed XML files
By default, do not include optional actions and dependancies in ptest output
---
crm/admin/cibadmin.c | 2
crm/admin/crm_mon.c | 7 +
crm/admin/crm_resource.c | 7 +
crm/admin/crm_verify.c | 2
crm/admin/xml_diff.c | 4
crm/cib/io.c | 2
crm/pengine/ptest.c | 33 +++--
crm/pengine/testcases/1360.dot | 20 ---
crm/pengine/testcases/594.dot | 31 -----
crm/pengine/testcases/662.dot | 59 ---------
crm/pengine/testcases/696.dot | 26 ----
crm/pengine/testcases/726.dot | 15 --
crm/pengine/testcases/735.dot | 19 ---
crm/pengine/testcases/764.dot | 43 -------
crm/pengine/testcases/797.dot | 25 ----
crm/pengine/testcases/829.dot | 58 ---------
crm/pengine/testcases/994.dot | 26 ----
crm/pengine/testcases/group1.dot | 5
crm/pengine/testcases/group10.dot | 70 -----------
crm/pengine/testcases/group11.dot | 7 -
crm/pengine/testcases/group13.dot | 16 --
crm/pengine/testcases/group2.dot | 5
crm/pengine/testcases/group3.dot | 11 -
crm/pengine/testcases/group4.dot | 38 ------
crm/pengine/testcases/group7.dot | 11 -
crm/pengine/testcases/group8.dot | 14 --
crm/pengine/testcases/group9.dot | 15 --
crm/pengine/testcases/inc0.dot | 5
crm/pengine/testcases/inc1.dot | 5
crm/pengine/testcases/inc10.dot | 107 -----------------
crm/pengine/testcases/inc2.dot | 16 --
crm/pengine/testcases/inc3.dot | 35 -----
crm/pengine/testcases/inc5.dot | 128 ---------------------
crm/pengine/testcases/inc6.dot | 111 ------------------
crm/pengine/testcases/inc7.dot | 11 -
crm/pengine/testcases/inc8.dot | 14 --
crm/pengine/testcases/inc9.dot | 34 -----
crm/pengine/testcases/interleave-0.dot | 106 -----------------
crm/pengine/testcases/interleave-1.dot | 106 -----------------
crm/pengine/testcases/interleave-2.dot | 106 -----------------
crm/pengine/testcases/interleave-3.dot | 106 -----------------
crm/pengine/testcases/managed-0.dot | 135 ----------------------
crm/pengine/testcases/managed-1.dot | 99 ----------------
crm/pengine/testcases/managed-2.dot | 19 ---
crm/pengine/testcases/master-0.dot | 15 --
crm/pengine/testcases/master-1.dot | 11 -
crm/pengine/testcases/master-10.dot | 30 -----
crm/pengine/testcases/master-2.dot | 30 -----
crm/pengine/testcases/master-3.dot | 11 -
crm/pengine/testcases/master-4.dot | 188 -------------------------------
crm/pengine/testcases/master-5.dot | 190 -------------------------------
crm/pengine/testcases/master-6.dot | 197 ---------------------------------
crm/pengine/testcases/master-7.dot | 118 -------------------
crm/pengine/testcases/master-8.dot | 102 -----------------
crm/pengine/testcases/master-9.dot | 73 ------------
crm/pengine/testcases/multi1.dot | 3
crm/pengine/testcases/notify-0.dot | 18 ---
crm/pengine/testcases/notify-1.dot | 44 -------
crm/pengine/testcases/notify-2.dot | 44 -------
crm/pengine/testcases/notify-3.dot | 23 ---
crm/pengine/testcases/order5.dot | 24 ----
crm/pengine/testcases/order6.dot | 18 ---
crm/pengine/testcases/order7.dot | 5
crm/pengine/testcases/orphan-0.dot | 24 ----
crm/pengine/testcases/orphan-1.dot | 26 ----
crm/pengine/testcases/params-0.dot | 30 -----
crm/pengine/testcases/params-1.dot | 24 ----
crm/pengine/testcases/probe-0.dot | 105 -----------------
crm/pengine/testcases/probe-1.dot | 2
crm/pengine/testcases/quorum-1.dot | 4
crm/pengine/testcases/quorum-2.dot | 6 -
crm/pengine/testcases/quorum-3.dot | 5
crm/pengine/testcases/quorum-5.dot | 5
crm/pengine/testcases/quorum-6.dot | 5
crm/pengine/testcases/rec-node-11.dot | 8 -
crm/pengine/testcases/rec-node-12.dot | 5
crm/pengine/testcases/rec-node-13.dot | 177 -----------------------------
crm/pengine/testcases/rec-node-2.dot | 10 -
crm/pengine/testcases/rec-node-8.dot | 2
crm/pengine/testcases/rec-node-9.dot | 4
crm/pengine/testcases/rec-rsc-0.dot | 3
crm/pengine/testcases/rec-rsc-2.dot | 1
crm/pengine/testcases/rec-rsc-4.dot | 2
crm/pengine/testcases/rec-rsc-6.dot | 3
crm/pengine/testcases/rec-rsc-7.dot | 3
crm/pengine/testcases/rec-rsc-8.dot | 3
crm/pengine/testcases/rsc_dep2.dot | 8 -
crm/pengine/testcases/rsc_dep4.dot | 4
crm/pengine/testcases/rsc_dep8.dot | 8 -
crm/pengine/testcases/simple3.dot | 2
crm/pengine/testcases/simple4.dot | 2
crm/pengine/testcases/simple7.dot | 2
crm/pengine/testcases/simple8.dot | 40 ------
crm/pengine/testcases/standby.dot | 46 -------
crm/pengine/testcases/target-0.dot | 30 -----
crm/pengine/testcases/target-1.dot | 24 ----
crm/pengine/testcases/unrunnable-1.dot | 54 ---------
crm/tengine/callbacks.c | 2
crm/tengine/ttest.c | 2
include/crm/common/xml.h | 2
lib/crm/common/xml.c | 89 +++++++++++---
101 files changed, 109 insertions(+), 3521 deletions(-)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- callbacks.c 23 Jun 2006 12:35:15 -0000 1.85
+++ callbacks.c 18 Jul 2006 06:16:08 -0000 1.86
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.85 2006/06/23 12:35:15 andrew Exp $ */
+/* $Id: callbacks.c,v 1.86 2006/07/18 06:16:08 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -240,7 +240,7 @@
} else {
FILE *graph_fd = fopen(graph_file, "r");
- crm_data_t *graph_data = file2xml(graph_fd);
+ crm_data_t *graph_data = file2xml(graph_fd, FALSE);
CRM_CHECK(graph_fd != NULL,
crm_err("Could not open graph filename: %s",
graph_file);
return TRUE);
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/ttest.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- ttest.c 16 Feb 2006 15:20:32 -0000 1.23
+++ ttest.c 18 Jul 2006 06:16:08 -0000 1.24
@@ -1,4 +1,4 @@
-/* $Id: ttest.c,v 1.23 2006/02/16 15:20:32 andrew Exp $ */
+/* $Id: ttest.c,v 1.24 2006/07/18 06:16:08 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -137,7 +137,7 @@
if(xml_file != NULL) {
FILE *xml_strm = fopen(xml_file, "r");
if(xml_strm) {
- xml_graph = file2xml(xml_strm);
+ xml_graph = file2xml(xml_strm, FALSE);
} else {
crm_err("Could not open %s for reading", xml_file);
xml_file = NULL;
------------------------------
Message: 2
Date: Tue, 18 Jul 2006 00:16:09 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm/common
Modified Files:
xml.h
Log Message:
Extra functionality for ptest
Support reading of compressed XML files
By default, do not include optional actions and dependancies in ptest output
---
crm/admin/cibadmin.c | 2
crm/admin/crm_mon.c | 7 +
crm/admin/crm_resource.c | 7 +
crm/admin/crm_verify.c | 2
crm/admin/xml_diff.c | 4
crm/cib/io.c | 2
crm/pengine/ptest.c | 33 +++--
crm/pengine/testcases/1360.dot | 20 ---
crm/pengine/testcases/594.dot | 31 -----
crm/pengine/testcases/662.dot | 59 ---------
crm/pengine/testcases/696.dot | 26 ----
crm/pengine/testcases/726.dot | 15 --
crm/pengine/testcases/735.dot | 19 ---
crm/pengine/testcases/764.dot | 43 -------
crm/pengine/testcases/797.dot | 25 ----
crm/pengine/testcases/829.dot | 58 ---------
crm/pengine/testcases/994.dot | 26 ----
crm/pengine/testcases/group1.dot | 5
crm/pengine/testcases/group10.dot | 70 -----------
crm/pengine/testcases/group11.dot | 7 -
crm/pengine/testcases/group13.dot | 16 --
crm/pengine/testcases/group2.dot | 5
crm/pengine/testcases/group3.dot | 11 -
crm/pengine/testcases/group4.dot | 38 ------
crm/pengine/testcases/group7.dot | 11 -
crm/pengine/testcases/group8.dot | 14 --
crm/pengine/testcases/group9.dot | 15 --
crm/pengine/testcases/inc0.dot | 5
crm/pengine/testcases/inc1.dot | 5
crm/pengine/testcases/inc10.dot | 107 -----------------
crm/pengine/testcases/inc2.dot | 16 --
crm/pengine/testcases/inc3.dot | 35 -----
crm/pengine/testcases/inc5.dot | 128 ---------------------
crm/pengine/testcases/inc6.dot | 111 ------------------
crm/pengine/testcases/inc7.dot | 11 -
crm/pengine/testcases/inc8.dot | 14 --
crm/pengine/testcases/inc9.dot | 34 -----
crm/pengine/testcases/interleave-0.dot | 106 -----------------
crm/pengine/testcases/interleave-1.dot | 106 -----------------
crm/pengine/testcases/interleave-2.dot | 106 -----------------
crm/pengine/testcases/interleave-3.dot | 106 -----------------
crm/pengine/testcases/managed-0.dot | 135 ----------------------
crm/pengine/testcases/managed-1.dot | 99 ----------------
crm/pengine/testcases/managed-2.dot | 19 ---
crm/pengine/testcases/master-0.dot | 15 --
crm/pengine/testcases/master-1.dot | 11 -
crm/pengine/testcases/master-10.dot | 30 -----
crm/pengine/testcases/master-2.dot | 30 -----
crm/pengine/testcases/master-3.dot | 11 -
crm/pengine/testcases/master-4.dot | 188 -------------------------------
crm/pengine/testcases/master-5.dot | 190 -------------------------------
crm/pengine/testcases/master-6.dot | 197 ---------------------------------
crm/pengine/testcases/master-7.dot | 118 -------------------
crm/pengine/testcases/master-8.dot | 102 -----------------
crm/pengine/testcases/master-9.dot | 73 ------------
crm/pengine/testcases/multi1.dot | 3
crm/pengine/testcases/notify-0.dot | 18 ---
crm/pengine/testcases/notify-1.dot | 44 -------
crm/pengine/testcases/notify-2.dot | 44 -------
crm/pengine/testcases/notify-3.dot | 23 ---
crm/pengine/testcases/order5.dot | 24 ----
crm/pengine/testcases/order6.dot | 18 ---
crm/pengine/testcases/order7.dot | 5
crm/pengine/testcases/orphan-0.dot | 24 ----
crm/pengine/testcases/orphan-1.dot | 26 ----
crm/pengine/testcases/params-0.dot | 30 -----
crm/pengine/testcases/params-1.dot | 24 ----
crm/pengine/testcases/probe-0.dot | 105 -----------------
crm/pengine/testcases/probe-1.dot | 2
crm/pengine/testcases/quorum-1.dot | 4
crm/pengine/testcases/quorum-2.dot | 6 -
crm/pengine/testcases/quorum-3.dot | 5
crm/pengine/testcases/quorum-5.dot | 5
crm/pengine/testcases/quorum-6.dot | 5
crm/pengine/testcases/rec-node-11.dot | 8 -
crm/pengine/testcases/rec-node-12.dot | 5
crm/pengine/testcases/rec-node-13.dot | 177 -----------------------------
crm/pengine/testcases/rec-node-2.dot | 10 -
crm/pengine/testcases/rec-node-8.dot | 2
crm/pengine/testcases/rec-node-9.dot | 4
crm/pengine/testcases/rec-rsc-0.dot | 3
crm/pengine/testcases/rec-rsc-2.dot | 1
crm/pengine/testcases/rec-rsc-4.dot | 2
crm/pengine/testcases/rec-rsc-6.dot | 3
crm/pengine/testcases/rec-rsc-7.dot | 3
crm/pengine/testcases/rec-rsc-8.dot | 3
crm/pengine/testcases/rsc_dep2.dot | 8 -
crm/pengine/testcases/rsc_dep4.dot | 4
crm/pengine/testcases/rsc_dep8.dot | 8 -
crm/pengine/testcases/simple3.dot | 2
crm/pengine/testcases/simple4.dot | 2
crm/pengine/testcases/simple7.dot | 2
crm/pengine/testcases/simple8.dot | 40 ------
crm/pengine/testcases/standby.dot | 46 -------
crm/pengine/testcases/target-0.dot | 30 -----
crm/pengine/testcases/target-1.dot | 24 ----
crm/pengine/testcases/unrunnable-1.dot | 54 ---------
crm/tengine/callbacks.c | 2
crm/tengine/ttest.c | 2
include/crm/common/xml.h | 2
lib/crm/common/xml.c | 89 +++++++++++---
101 files changed, 109 insertions(+), 3521 deletions(-)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/xml.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- xml.h 21 Jun 2006 08:40:13 -0000 1.48
+++ xml.h 18 Jul 2006 06:16:09 -0000 1.49
@@ -1,4 +1,4 @@
-/* $Id: xml.h,v 1.48 2006/06/21 08:40:13 andrew Exp $ */
+/* $Id: xml.h,v 1.49 2006/07/18 06:16:09 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -183,7 +183,7 @@
*
* Whitespace between tags is discarded.
*/
-extern crm_data_t *file2xml(FILE *input);
+extern crm_data_t *file2xml(FILE *input, gboolean compressed);
extern crm_data_t *stdin2xml(void);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 52
********************************************
