Skip to contentSkip to conversation

sa-init-db: Fix argument parsing

PATCH In review Ian Jackson 2 participants 4 messages Oct 24, 2018 – Oct 25, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 sa-init-db: Fix argument parsing

It claimed to have a default db name, but it didn't. Rework the option parsing to make the usage message true. (That saves me typing
sa-init-db standalone
and getting bizarre errors as sqlite tries to treat the shell script `standalone' as if it were a database file.)

---
 sa-init-db | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
sa-init-db +9 -8
index bd9aa4a4..2c97aaba 100755
@@ -18,18 +18,19 @@
 
 set -e -o posix
 
-usage(){
-	cat <<END
+badusage(){
+	cat <<END >&2
 usage: ./sa-init-db [database]
 END
+	exit 127
 }
 
-if [ $# -ne 1 ] ; then
-	usage >&2
-	exit 1
-fi
-
-db="$1"
+case "$#.$*" in
+0.)	db=standalone.db	;;
+1.-*)	badusage		;;
+1.*)	db="$1"			;;
+*)	badusage		;;
+esac
 
 sqlite3 "$db" <<END
 	CREATE TABLE flights (
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw

PATCH 2/3 standalone-generate-dump-flight-runvars: Add example usage

I have to reinvent these runes each time, which is somewhat annoying.

---
 standalone-generate-dump-flight-runvars | 4 ++++
 1 file changed, 4 insertions(+)
standalone-generate-dump-flight-runvars +4 -0
index 04631b3d..3b893623 100755
@@ -7,6 +7,10 @@
 #
 # If no BRANCHes specified, does all that are normally run by
 # cr-daily-branch or out of crontab.
+#
+# A good rune is:
+#   OSSTEST_CONFIG=standalone-config-example ./sa-init-db
+#   OSSTEST_CONFIG=standalone-config-example eatmydata ./standalone-generate-dump-flight-runvars >output
 
 # This is part of "osstest", an automated testing framework for Xen.
 # Copyright (C) 2009-2014 Citrix Inc.
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#2 lore raw

PATCH 3/3 mfi-common: Drop freebsd builds on non-freebsd flights

In reply to Ian Jackson

Something is wrong with the freebsd repositories. This causes freebsd host installation to fail. This problem has persisted for a while now and is blocking other work.

For now, drop these. The jobs being dropped are
build-amd64-xen-freebsd build-amd64-xen-xsm-freebsd
in the branches
osstest
xen-unstable
(verified with standalone-generate-dump-flight-runvars).

CC Roger Pau Monné <[email protected]>
CC Wei Liu <[email protected]>
---
 mfi-common | 1 +
 1 file changed, 1 insertion(+)
mfi-common +1 -0
index ae6a337d..c2866e93 100644
@@ -335,6 +335,7 @@ create_build_jobs () {
       *)                build_on_freebsd=true;;
       esac;;
     esac
+    build_on_freebsd=false
 
     want_prevxen=n
     if branch_wants_migrupgrade_tests ; then
Signature · 7 lines
2.11.0


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Acked-by on v1 3/3
#3 lore raw

Re: [OSSTEST PATCH 3/3] mfi-common: Drop freebsd builds on non-freebsd flights

Quoted 12 lines · Ian Jackson

Something is wrong with the freebsd repositories. This causes freebsd host installation to fail. This problem has persisted for a while now and is blocking other work.

For now, drop these. The jobs being dropped are
build-amd64-xen-freebsd build-amd64-xen-xsm-freebsd
in the branches
osstest
xen-unstable
(verified with standalone-generate-dump-flight-runvars).

Quoted 3 lines
CC Roger Pau Monné <[email protected]>
CC Wei Liu <[email protected]>

I'm really sorry, I've been trying to get this fixed upstream but there seems to be some (infra?) issues because FreeBSD is in the middle of the branching process for the 12.0 release.

I have a plan to fix this properly so there's no dependency on upstream binary packages anymore.

Thanks, Roger.

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel