Commit Diff

Commit:
f1f83f317abbce0e15ebf91490b1cb620e810213
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make test_stage_directory pass and actually hook it up to regress runs
Actions:
Patch | Tree
commit - bb068081f1967fa4f4f5c5e6db0d1065244f6539
commit + f1f83f317abbce0e15ebf91490b1cb620e810213
blob - 3574d07a0fe6f57793fe8dbfe5997c032aa0b710
blob + 56c7c3d94ec8c638360c2980c7e28c7de32199e4
--- regress/cmdline/stage.sh
+++ regress/cmdline/stage.sh
@@ -72,14 +72,13 @@ test_stage_directory() {
 
 	(cd $testroot/wt && got stage -R . > $testroot/stdout)
 
-	echo 'G  test' >> $testroot/stdout.expected
+	echo ' A test' >> $testroot/stdout.expected
 	cmp -s $testroot/stdout.expected $testroot/stdout
 	ret=$?
 	if [ $ret -ne 0 ]; then
 		diff -u $testroot/stdout.expected $testroot/stdout
-		test_done "$testroot" "$ret"
-		return 1
-	fi
+	fi
+	test_done "$testroot" "$ret"
 }
 
 test_stage_no_changes() {
@@ -3078,6 +3077,7 @@ EOF
 
 test_parseargs "$@"
 run_test test_stage_basic
+run_test test_stage_directory
 run_test test_stage_no_changes
 run_test test_stage_unversioned
 run_test test_stage_nonexistent