diff mbox

[Xen-devel,OSSTEST,1/2] standalone: refactor out some useful bits of standalone-reset

Message ID 1395332482-5892-1-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell March 20, 2014, 4:21 p.m. UTC 
I sometimes want just these bits.

I went with a new "sa" prefix, but I left standalone-reset alone since it is
already reasonably well known.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 README           |  3 +++
 sa-forget-flight | 39 +++++++++++++++++++++++++++++++++++++++
 sa-init-db       | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 standalone-reset | 30 ++----------------------------
 4 files changed, 100 insertions(+), 28 deletions(-)
 create mode 100755 sa-forget-flight
 create mode 100755 sa-init-db

Comments

Ian Jackson March 20, 2014, 4:27 p.m. UTC | #1 
Ian Campbell writes ("[PATCH OSSTEST 1/2] standalone: refactor out some useful bits of standalone-reset"):
> I sometimes want just these bits.
...
> diff --git a/sa-forget-flight b/sa-forget-flight
> new file mode 100755
> index 0000000..65668f5
> --- /dev/null
> +++ b/sa-forget-flight
...
> +usage: ./sa-forget-flight [database] [flight]

ITYM "<database> <flight>".  They're not optional AFAICT.

Ian.
Ian Campbell March 20, 2014, 4:32 p.m. UTC | #2 
On Thu, 2014-03-20 at 16:27 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST 1/2] standalone: refactor out some useful bits of standalone-reset"):
> > I sometimes want just these bits.
> ...
> > diff --git a/sa-forget-flight b/sa-forget-flight
> > new file mode 100755
> > index 0000000..65668f5
> > --- /dev/null
> > +++ b/sa-forget-flight
> ...
> > +usage: ./sa-forget-flight [database] [flight]
> 
> ITYM "<database> <flight>".  They're not optional AFAICT.

YIDM "<database> <flight>".

Also you didn't spot the deliberate mistake:
        db="$1"
        flight="$1"

;-)

(this is in my "ui" branch so I'm not routinely actually using it yet...)

Ian.
diff mbox

Patch

diff --git a/README b/README
index a4d5aac..9a85549 100644
--- a/README
+++ b/README
@@ -158,6 +158,9 @@  sg-*:   ?
 
 ts-*:   Test Step scripts.
 
+sa-*:	Standalone mode.
+
+
 Jobs
 ====
 
diff --git a/sa-forget-flight b/sa-forget-flight
new file mode 100755
index 0000000..65668f5
--- /dev/null
+++ b/sa-forget-flight
@@ -0,0 +1,39 @@ 
+#!/bin/bash
+
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2014 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+usage(){
+	cat <<END
+usage: ./sa-forget-flight [database] [flight]
+END
+}
+
+if [ $# -ne 2 ] ; then
+	usage >&2
+	exit 1
+fi
+
+db="$1"
+flight="$1"
+
+sqlite3 "$db" <<END
+	DELETE FROM runvars WHERE flight='$flight';
+	DELETE FROM jobs    WHERE flight='$flight';
+	DELETE FROM flights WHERE flight='$flight';
+END
diff --git a/sa-init-db b/sa-init-db
new file mode 100755
index 0000000..37ab4be
--- /dev/null
+++ b/sa-init-db
@@ -0,0 +1,56 @@ 
+#!/bin/bash
+
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2014 Citrix Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+usage(){
+	cat <<END
+usage: ./sa-init-db [database]
+END
+}
+
+if [ $# -ne 1 ] ; then
+	usage >&2
+	exit 1
+fi
+
+db="$1"
+
+sqlite3 "$db" <<END
+	CREATE TABLE flights (
+		flight TEXT PRIMARY KEY,
+		blessing TEXT,
+		intended TEXT,
+		branch TEXT
+		);
+	CREATE TABLE jobs (
+		flight TEXT NOT NULL,
+		job TEXT NOT NULL,
+		recipe TEXT NOT NULL,
+		status TEXT NOT NULL,
+		PRIMARY KEY(flight,job)
+		);
+	CREATE TABLE runvars (
+		flight TEXT NOT NULL,
+		job TEXT NOT NULL,
+		name TEXT NOT NULL,
+		val TEXT NOT NULL,
+		synth BOOLEAN NOT NULL,
+		PRIMARY KEY(flight,job,name)
+		);
+END
diff --git a/standalone-reset b/standalone-reset
index e978b6b..09c0269 100755
--- a/standalone-reset
+++ b/standalone-reset
@@ -131,35 +131,9 @@  case $# in
 esac
 
 if test -f standalone.db; then
-	sqlite3 standalone.db <<END
-		DELETE FROM runvars WHERE flight='$flight';
-		DELETE FROM jobs    WHERE flight='$flight';
-		DELETE FROM flights WHERE flight='$flight';
-END
+	./sa-forget-flight standalone.db "$flight"
 else
-	sqlite3 standalone.db <<END
-		CREATE TABLE flights (
-			flight TEXT PRIMARY KEY,
-			blessing TEXT,
-			intended TEXT,
-			branch TEXT
-			);
-		CREATE TABLE jobs (
-			flight TEXT NOT NULL,
-			job TEXT NOT NULL,
-			recipe TEXT NOT NULL,
-			status TEXT NOT NULL,
-			PRIMARY KEY(flight,job)
-			);
-		CREATE TABLE runvars (
-			flight TEXT NOT NULL,
-			job TEXT NOT NULL,
-			name TEXT NOT NULL,
-			val TEXT NOT NULL,
-			synth BOOLEAN NOT NULL,
-			PRIMARY KEY(flight,job,name)
-			);
-END
+	./sa-db-init standalone.db
 fi
 
 : ${BUILD_LVEXTEND_MAX:=50}