Tag
Hash :
f6cae3ed
Author :
Date :
2020-09-13T14:05:17
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 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372
#!/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
test_add_basic() {
local testroot=`test_init add_basic`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "new file" > $testroot/wt/foo
echo 'A foo' > $testroot/stdout.expected
(cd $testroot/wt && got add foo > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
test_double_add() {
local testroot=`test_init double_add`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "new file" > $testroot/wt/foo
(cd $testroot/wt && got add foo > /dev/null)
(cd $testroot/wt && got add foo > $testroot/stdout)
ret="$?"
if [ "$ret" != "0" ]; then
echo "got add failed unexpectedly" >&2
test_done "$testroot" 1
return 1
fi
echo -n > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
test_add_multiple() {
local testroot=`test_init multiple_add`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "new file" > $testroot/wt/foo
echo "new file" > $testroot/wt/bar
echo "new file" > $testroot/wt/baz
(cd $testroot/wt && got add foo bar baz > $testroot/stdout)
ret="$?"
if [ "$ret" != "0" ]; then
echo "got add failed unexpectedly" >&2
test_done "$testroot" 1
return 1
fi
echo "A foo" > $testroot/stdout.expected
echo "A bar" >> $testroot/stdout.expected
echo "A baz" >> $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
test_add_file_in_new_subdir() {
local testroot=`test_init add_file_in_new_subdir`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
mkdir -p $testroot/wt/new
echo "new file" > $testroot/wt/new/foo
echo 'A new/foo' > $testroot/stdout.expected
(cd $testroot/wt && got add new/foo > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
test_add_deleted() {
local testroot=`test_init add_deleted`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
(cd $testroot/wt && got rm beta > /dev/null)
echo -n > $testroot/stdout.expected
(cd $testroot/wt && got add beta > $testroot/stdout 2> $testroot/stderr)
ret="$?"
if [ "$ret" == "0" ]; then
echo "got add command succeeded unexpectedly" >&2
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "1"
return 1
fi
echo "got: beta: file has unexpected status" > $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
fi
test_done "$testroot" "$ret"
}
test_add_directory() {
local testroot=`test_init add_directory`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
(cd $testroot/wt && got add . > $testroot/stdout 2> $testroot/stderr)
ret="$?"
echo "got: adding directories requires -R option" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
test_done "$testroot" "$ret"
return 1
fi
(cd $testroot/wt && got add -I . > $testroot/stdout 2> $testroot/stderr)
ret="$?"
echo "got: disregarding ignores requires -R option" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
test_done "$testroot" "$ret"
return 1
fi
echo -n > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
mkdir -p $testroot/wt/tree1
mkdir -p $testroot/wt/tree2
echo "tree1/**" > $testroot/wt/.gitignore
echo "tree2/**" >> $testroot/wt/.gitignore
echo -n > $testroot/wt/tree1/foo
echo -n > $testroot/wt/tree2/foo
echo -n > $testroot/wt/epsilon/zeta1
echo -n > $testroot/wt/epsilon/zeta2
(cd $testroot/wt && got add -R . > $testroot/stdout)
echo 'A .gitignore' > $testroot/stdout.expected
echo 'A epsilon/zeta1' >> $testroot/stdout.expected
echo 'A epsilon/zeta2' >> $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
(cd $testroot/wt && got add -RI tree1 > $testroot/stdout)
echo 'A tree1/foo' > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
(cd $testroot/wt && got add tree2/foo > $testroot/stdout)
echo 'A tree2/foo' > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
test_done "$testroot" "$ret"
}
test_add_clashes_with_submodule() {
local testroot=`test_init add_clashes_with_submodule`
make_single_file_repo $testroot/repo2 foo
(cd $testroot/repo && git submodule -q add ../repo2)
(cd $testroot/repo && git commit -q -m 'adding submodule')
got checkout $testroot/repo $testroot/wt > /dev/null
# Atttempt to add a file clashes with a submodule
echo "This is a file called repo2" > $testroot/wt/repo2
(cd $testroot/wt && got add repo2 > /dev/null)
(cd $testroot/wt && got status > $testroot/stdout)
echo "A repo2" > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# Update for good measure; see the error below.
(cd $testroot/wt && got update > /dev/null)
# This currently fails with "work tree must be updated"...
(cd $testroot/wt && got commit -m 'add file repo2' \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
if [ "$ret" == "0" ]; then
echo "commit succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
fi
echo -n "got: work tree must be updated " > $testroot/stderr.expected
echo "before these changes can be committed" >> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
fi
test_done "$testroot" "$ret"
}
test_add_symlink() {
local testroot=`test_init add_symlink`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
(cd $testroot/wt && ln -s alpha alpha.link)
(cd $testroot/wt && ln -s epsilon epsilon.link)
(cd $testroot/wt && ln -s /etc/passwd passwd.link)
(cd $testroot/wt && ln -s ../beta epsilon/beta.link)
(cd $testroot/wt && ln -s nonexistent nonexistent.link)
echo "A alpha.link" > $testroot/stdout.expected
(cd $testroot/wt && got add alpha.link > $testroot/stdout)
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
echo "A epsilon.link" > $testroot/stdout.expected
(cd $testroot/wt && got add epsilon.link > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
echo "A passwd.link" > $testroot/stdout.expected
(cd $testroot/wt && got add passwd.link > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
echo "A epsilon/beta.link" > $testroot/stdout.expected
(cd $testroot/wt && got add epsilon/beta.link > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
echo "A nonexistent.link" > $testroot/stdout.expected
(cd $testroot/wt && got add nonexistent.link > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
test_parseargs "$@"
run_test test_add_basic
run_test test_double_add
run_test test_add_multiple
run_test test_add_file_in_new_subdir
run_test test_add_deleted
run_test test_add_directory
run_test test_add_clashes_with_submodule
run_test test_add_symlink