add a command line test suite with a simple 'got checkout' test
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184
diff --git a/README b/README
index 94812f8..f918083 100644
--- a/README
+++ b/README
@@ -15,8 +15,8 @@ This will install the following commands to ~/bin:
tog (ncurses interface)
and several helper programs from the libexec directory
-The tests will pass only after 'make install' because
-they rely on installed libexec binaries:
+Tests will pass only after 'make install' because they rely on installed
+libexec binaries. Tests in the cmdline directory currently depend on git(1).
$ make regress
diff --git a/regress/Makefile b/regress/Makefile
index 31e2dae..bd68cd5 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,3 +1,3 @@
-SUBDIR = delta idset repository worktree
+SUBDIR = cmdline delta idset repository worktree
.include <bsd.subdir.mk>
diff --git a/regress/cmdline/Makefile b/regress/cmdline/Makefile
new file mode 100644
index 0000000..7570e53
--- /dev/null
+++ b/regress/cmdline/Makefile
@@ -0,0 +1,6 @@
+REGRESS_TARGETS=checkout
+
+checkout:
+ ./checkout.sh
+
+.include <bsd.regress.mk>
diff --git a/regress/cmdline/checkout.sh b/regress/cmdline/checkout.sh
new file mode 100755
index 0000000..b6cbba3
--- /dev/null
+++ b/regress/cmdline/checkout.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+. ./common.sh
+
+function test_checkout_basic {
+ local testroot=`test_init checkout_basic`
+
+ echo "A $testroot/wt/alpha" > $testroot/stdout.expected
+ echo "A $testroot/wt/beta" >> $testroot/stdout.expected
+ echo "A $testroot/wt/epsilon/zeta" >> $testroot/stdout.expected
+ echo "A $testroot/wt/gamma/delta" >> $testroot/stdout.expected
+ echo "Now shut up and hack" >> $testroot/stdout.expected
+
+ got checkout $testroot/repo $testroot/wt > $testroot/stdout
+ if [ "$?" != "0" ]; then
+ test_done "$testroot" "$?"
+ return 1
+ fi
+
+ cmp $testroot/stdout.expected $testroot/stdout
+ if [ "$?" != "0" ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ test_done "$testroot" "$?"
+ return 1
+ fi
+
+ echo "alpha" > $testroot/content.expected
+ echo "beta" >> $testroot/content.expected
+ echo "zeta" >> $testroot/content.expected
+ echo "delta" >> $testroot/content.expected
+ cat $testroot/wt/alpha $testroot/wt/beta $testroot/wt/epsilon/zeta \
+ $testroot/wt/gamma/delta > $testroot/content
+
+ cmp $testroot/content.expected $testroot/content
+ if [ "$?" != "0" ]; then
+ diff -u $testroot/content.expected $testroot/content
+ fi
+ test_done "$testroot" "$?"
+}
+
+# run tests
+run_test test_checkout_basic
diff --git a/regress/cmdline/common.sh b/regress/cmdline/common.sh
new file mode 100644
index 0000000..4fb24d6
--- /dev/null
+++ b/regress/cmdline/common.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+function git_init
+{
+ git init -q "$@"
+}
+
+function git_commit
+{
+ local repo="$1"
+ shift
+ (cd $repo && git commit -q -a "$@")
+}
+
+function make_test_tree
+{
+ repo="$1"
+
+ echo alpha > $repo/alpha
+ echo beta > $repo/beta
+ mkdir $repo/gamma
+ echo delta > $repo/gamma/delta
+ mkdir $repo/epsilon
+ echo zeta > $repo/epsilon/zeta
+ (cd $repo && git add .)
+}
+
+function test_init
+{
+ local testname="$1"
+ if [ -z "$testname" ]; then
+ echo "No test name provided" >&2
+ return 1
+ fi
+ local testroot=`mktemp -p /tmp -d got-test-$testname-XXXXXXXX`
+ mkdir $testroot/repo
+ git_init $testroot/repo
+ make_test_tree $testroot/repo
+ git_commit $testroot/repo -m "adding the test tree"
+ echo "$testroot"
+}
+
+function test_cleanup
+{
+ local testroot="$1"
+ rm -rf "$testroot"
+}
+
+function run_test
+{
+ testfunc="$1"
+ echo "$testfunc"
+ $testfunc
+}
+
+function test_done
+{
+ local testroot="$1"
+ local result="$2"
+ if [ "$result" == "0" ]; then
+ test_cleanup "$testroot"
+ else
+ echo "test failed; leaving test data in $testroot"
+ fi
+}