aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
Diffstat (limited to 'cmd')
-rw-r--r--cmd/lulu/flag.go2
-rw-r--r--cmd/lulu/main.go2
-rwxr-xr-xcmd/lulu/test29
-rw-r--r--cmd/lulu/testdata/cd1
-rw-r--r--cmd/lulu/tests/cd1
-rw-r--r--cmd/lulu/tests/cd_nomfg2
6 files changed, 35 insertions, 2 deletions
diff --git a/cmd/lulu/flag.go b/cmd/lulu/flag.go
index a6592d7..a16aa52 100644
--- a/cmd/lulu/flag.go
+++ b/cmd/lulu/flag.go
@@ -16,7 +16,7 @@ import (
)
func pkgIdFlag(p *lulu.PkgId, required bool) Flag {
- return Flag{&pkgIdValue{p, false}, "mfg", fmt.Sprintf("Manufacturing options (%T)", *p), required}
+ return Flag{&pkgIdValue{p, false}, "mfg", fmt.Sprintf("%s manufacturing options", typeName(*p)), required}
}
func nPagesFlag(p *uint, required bool) Flag {
diff --git a/cmd/lulu/main.go b/cmd/lulu/main.go
index 7cf6bb3..6e6f146 100644
--- a/cmd/lulu/main.go
+++ b/cmd/lulu/main.go
@@ -132,7 +132,7 @@ func validateInterior(name string, clnt *lulu.Client, args []string) {
timeoutFlag(&timeout, false),
},
fmt.Sprintf("%s %s %s [flags]\n", name, urlFlag.Synopsis(), mfgFlag.Synopsis()),
- fmt.Sprintf(" %s %s %s [flags]\n", name, basicFlag.Synopsis(), urlFlag.Synopsis()))
+ fmt.Sprintf("%s %s %s [flags]\n", name, basicFlag.Synopsis(), urlFlag.Synopsis()))
fs.Parse(args)
var val lulu.InteriorValidation
diff --git a/cmd/lulu/test b/cmd/lulu/test
new file mode 100755
index 0000000..e819005
--- /dev/null
+++ b/cmd/lulu/test
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -u
+
+[[ ! -d testout ]] && mkdir testout
+
+for test in tests/*
+do
+ base=${test##*/}
+ want=testdata/$base
+ out=testout/$base
+ if [ -f $want ]; then
+ sh $test >$out 2>/dev/null
+ if ! cmp -s $want $out
+ then
+ echo "FAIL $test: <Expected >Actual"
+ diff $want $out
+ exit 1
+ fi
+ else
+ if sh $test >$out 2>/dev/null
+ then
+ echo "FAIL $test: expected error; got \"$(cat $out)\""
+ exit 1
+ fi
+ fi
+done
+
+echo ok
diff --git a/cmd/lulu/testdata/cd b/cmd/lulu/testdata/cd
new file mode 100644
index 0000000..4d81ea7
--- /dev/null
+++ b/cmd/lulu/testdata/cd
@@ -0,0 +1 @@
+307.870 x 216.410 mm
diff --git a/cmd/lulu/tests/cd b/cmd/lulu/tests/cd
new file mode 100644
index 0000000..16520fc
--- /dev/null
+++ b/cmd/lulu/tests/cd
@@ -0,0 +1 @@
+lulu -s cd -mfg 0583X0827.BW.PRE.PB.060UW444.MXX -n 67 -u mm
diff --git a/cmd/lulu/tests/cd_nomfg b/cmd/lulu/tests/cd_nomfg
new file mode 100644
index 0000000..8404fed
--- /dev/null
+++ b/cmd/lulu/tests/cd_nomfg
@@ -0,0 +1,2 @@
+# missing -mfg
+lulu -s cd -n 200