Commit Diff

Commit:
180f111d564b657f44e4182cd43fcfbdd40096bc
From:
Stefan Sperling <stsp@stsp.name>
Via:
Thomas Adam <thomas.adam@smoothwall.net>
Date:
Message:
regress: fix test failures using date(1) This patch fixes test failures related the date(1) utility. In the long term we could add a wrapper function to detect valid options for date(1) and use the variant which works on the current OS. For now, this makes some tests pass and shows us where the problems are. OK thomas.adam
Actions:
Patch | Tree
commit - 2b0eee35db2db91d58fc4f76944a384911659ce0
commit + 180f111d564b657f44e4182cd43fcfbdd40096bc
blob - f03727dc8b09d97a93d6ee86cc68c916c3f792ad
blob + d14847a79bb0de1171b72e1aeb01a7105d059fcc
--- regress/Makefile
+++ regress/Makefile
@@ -1,3 +1,3 @@
 SUBDIR = cmdline delta deltify idset path fetch
 
-.include <bsd.subdir.mk>
+#.include <bsd.subdir.mk>
blob - a9916124c369cb2ba1bac4634cd2e80573716a5a
blob + 243a3bc445d4bebd03c332ef94953b499c1f0112
--- regress/cmdline/blame.sh
+++ regress/cmdline/blame.sh
@@ -65,7 +65,7 @@ test_blame_basic() {
 	local short_commit2=`trim_obj_id 32 $commit2`
 	local short_commit3=`trim_obj_id 32 $commit3`
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected
 	echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected
 	echo "3) $short_commit3 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected
@@ -113,7 +113,7 @@ test_blame_tag() {
 	local short_commit1=`trim_obj_id 32 $commit1`
 	local short_commit2=`trim_obj_id 32 $commit2`
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected
 	echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected
 
@@ -149,7 +149,7 @@ test_blame_file_single_line() {
 
 	local short_commit1=`trim_obj_id 32 $commit1`
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected
 
 	cmp -s $testroot/stdout.expected $testroot/stdout
@@ -184,7 +184,7 @@ test_blame_file_single_line_no_newline() {
 
 	local short_commit1=`trim_obj_id 32 $commit1`
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected
 
 	cmp -s $testroot/stdout.expected $testroot/stdout
@@ -213,7 +213,7 @@ test_blame_all_lines_replaced() {
 
 	(cd $testroot/wt && got blame alpha > $testroot/stdout)
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected
 	echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected
 	echo "3) $short_commit1 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected
@@ -265,7 +265,7 @@ test_blame_lines_shifted_up() {
 
 	(cd $testroot/wt && got blame alpha > $testroot/stdout)
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected
 	echo "2) $short_commit1 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected
 	echo "3) $short_commit3 $d $GOT_AUTHOR_8 foo" >> $testroot/stdout.expected
@@ -321,7 +321,7 @@ test_blame_lines_shifted_down() {
 
 	(cd $testroot/wt && got blame alpha > $testroot/stdout)
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "01) $short_commit1 $d $GOT_AUTHOR_8 1" \
 		> $testroot/stdout.expected
 	echo "02) $short_commit1 $d $GOT_AUTHOR_8 2" \
@@ -394,7 +394,7 @@ EOF
 	local commit1=`git_show_head $testroot/repo`
 	local short_commit1=`trim_obj_id 32 $commit1`
 	local author_time1=`git_show_author_time $testroot/repo`
-	local d1=`date -u -r $author_time1 +"%G-%m-%d"`
+	local d1=`date -u -d "@$author_time1" +"%G-%m-%d"`
 
 	cat > $testroot/wt/alpha <<EOF
 SUBDIRS = ext modules codedocs docs
@@ -421,7 +421,7 @@ EOF
 	local commit2=`git_show_head $testroot/repo`
 	local short_commit2=`trim_obj_id 32 $commit2`
 	local author_time2=`git_show_author_time $testroot/repo`
-	local d2=`date -u -r $author_time2 +"%G-%m-%d"`
+	local d2=`date -u -d "@$author_time2" +"%G-%m-%d"`
 
 	cat > $testroot/wt/alpha <<EOF
 SUBDIRS = ext modules pdns codedocs docs
@@ -445,7 +445,7 @@ EOF
 	local commit3=`git_show_head $testroot/repo`
 	local short_commit3=`trim_obj_id 32 $commit3`
 	local author_time3=`git_show_author_time $testroot/repo`
-	local d3=`date -u -r $author_time3 +"%G-%m-%d"`
+	local d3=`date -u -d "@$author_time3" +"%G-%m-%d"`
 
 	cat > $testroot/wt/alpha <<EOF
 SUBDIRS = ext modules pdns codedocs docs
@@ -469,7 +469,7 @@ EOF
 	local commit4=`git_show_head $testroot/repo`
 	local short_commit4=`trim_obj_id 32 $commit4`
 	local author_time4=`git_show_author_time $testroot/repo`
-	local d4=`date -u -r $author_time4 +"%G-%m-%d"`
+	local d4=`date -u -d "@$author_time4" +"%G-%m-%d"`
 
 	(cd $testroot/wt && got blame alpha > $testroot/stdout)
 
@@ -718,7 +718,7 @@ test_blame_added_on_branch() {
 	local short_commit2=`trim_obj_id 32 $commit2`
 	local short_commit3=`trim_obj_id 32 $commit3`
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit1 $d $GOT_AUTHOR_8 1" > $testroot/stdout.expected
 	echo "2) $short_commit2 $d $GOT_AUTHOR_8 2" >> $testroot/stdout.expected
 	echo "3) $short_commit3 $d $GOT_AUTHOR_8 3" >> $testroot/stdout.expected
@@ -788,7 +788,7 @@ test_blame_symlink() {
 		return 1
 	fi
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit0 $d $GOT_AUTHOR_8 alpha" \
 		> $testroot/stdout.expected
 
@@ -809,7 +809,7 @@ test_blame_symlink() {
 		return 1
 	fi
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit0 $d $GOT_AUTHOR_8 beta" \
 		> $testroot/stdout.expected
 
@@ -958,7 +958,7 @@ EOF
 
 	(cd $testroot/wt && got blame alpha > $testroot/stdout)
 
-	d=`date -u -r $author_time +"%G-%m-%d"`
+	d=`date -u -d "@$author_time" +"%G-%m-%d"`
 	echo "1) $short_commit5 $d $GOT_AUTHOR_8 X" > $testroot/stdout.expected
 	echo "2) $short_commit1 $d $GOT_AUTHOR_8 A" >> $testroot/stdout.expected
 	echo "3) $short_commit1 $d $GOT_AUTHOR_8 B" >> $testroot/stdout.expected
blob - d2b9ef37e4422a8ab8e017e17df21a7c6f3be7e8
blob + 7ec03bec2d52a6057271e13b0db522b72920403d
--- regress/cmdline/commit.sh
+++ regress/cmdline/commit.sh
@@ -1399,7 +1399,7 @@ EOF
 	fi
 
 	local author_time=`git_show_author_time $testroot/repo`
-	d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
+	d=`env LC_TIME=C date -u -d "@$author_time" +"%a %b %e %X %Y UTC"`
 	echo "-----------------------------------------------" > $testroot/stdout.expected
 	echo "commit $head_rev (master)" >> $testroot/stdout.expected
 	echo "from: $GOT_AUTHOR" >> $testroot/stdout.expected
@@ -1438,7 +1438,7 @@ EOF
 	fi
 
 	local author_time=`git_show_author_time $testroot/repo`
-	d=`date -u -r $author_time +"%a %b %e %X %Y UTC"`
+	d=`env LC_TIME=C date -u -d "@$author_time" +"%a %b %e %X %Y UTC"`
 	echo "-----------------------------------------------" \
 		> $testroot/stdout.expected
 	echo "commit $head_rev (master)" >> $testroot/stdout.expected
blob - 61bcebf99d9b2d05bc608cd43b07f0c9e3cdf818
blob + 24ae6d99cf14c28bd331ff1aebba74a90761a951
--- regress/cmdline/histedit.sh
+++ regress/cmdline/histedit.sh
@@ -153,10 +153,10 @@ test_histedit_no_op() {
 
 	# We should have a backup of old commits
 	(cd $testroot/repo && got histedit -l > $testroot/stdout)
-	d_orig1=`date -u -r $old_author_time1 +"%G-%m-%d"`
-	d_orig2=`date -u -r $old_author_time2 +"%a %b %e %X %Y UTC"`
-	d_new2=`date -u -r $new_author_time2 +"%G-%m-%d"`
-	d_orig=`date -u -r $orig_author_time +"%G-%m-%d"`
+	d_orig1=`date -u -d "@$old_author_time1" +"%G-%m-%d"`
+	d_orig2=`env LC_TIME=C date -u -d "@$old_author_time2" +"%a %b %e %X %Y UTC"`
+	d_new2=`date -u -d "@$new_author_time2" +"%G-%m-%d"`
+	d_orig=`date -u -d "@$orig_author_time" +"%G-%m-%d"`
 	cat > $testroot/stdout.expected <<EOF
 -----------------------------------------------
 commit $old_commit2 (formerly master)
blob - a3608c60299d965c964b1a34f3b87ad35addc9c6
blob + fb0d3cf6ab0733385d8d9b463c46f77f5bdbc294
--- regress/cmdline/rebase.sh
+++ regress/cmdline/rebase.sh
@@ -153,9 +153,9 @@ test_rebase_basic() {
 
 	# We should have a backup of old commits
 	(cd $testroot/repo && got rebase -l > $testroot/stdout)
-	d_orig2=`date -u -r $orig_author_time2 +"%a %b %e %X %Y UTC"`
-	d_new2=`date -u -r $new_author_time2 +"%G-%m-%d"`
-	d_0=`date -u -r $commit0_author_time +"%G-%m-%d"`
+	d_orig2=`env LC_TIME=C date -u -d "@$orig_author_time2" +"%a %b %e %X %Y UTC"`
+	d_new2=`date -u -d "@$new_author_time2" +"%G-%m-%d"`
+	d_0=`date -u -d "@$commit0_author_time" +"%G-%m-%d"`
 	cat > $testroot/stdout.expected <<EOF
 -----------------------------------------------
 commit $orig_commit2 (formerly newbranch)
blob - fdc7ff875ee50b4012f757c1df86b00c41cd3dd0
blob + 6e6e9148cba91c0585e5864abd297b37af5c317a
--- regress/cmdline/tag.sh
+++ regress/cmdline/tag.sh
@@ -137,11 +137,11 @@ test_tag_list() {
 	tag_id=`got ref -r $testroot/repo -l \
 		| grep "^refs/tags/$tag" | tr -d ' ' | cut -d: -f2`
 	local tagger_time=`git_show_tagger_time $testroot/repo $tag`
-	d1=`date -u -r $tagger_time +"%a %b %e %X %Y UTC"`
+	d1=`env LC_TIME=C date -u -d "@$tagger_time" +"%a %b %e %X %Y UTC"`
 	tag_id2=`got ref -r $testroot/repo -l \
 		| grep "^refs/tags/$tag2" | tr -d ' ' | cut -d: -f2`
 	local tagger_time2=`git_show_tagger_time $testroot/repo $tag2`
-	d2=`date -u -r $tagger_time2 +"%a %b %e %X %Y UTC"`
+	d2=`env LC_TIME=C date -u -d "@$tagger_time2" +"%a %b %e %X %Y UTC"`
 
 	got tag -r $testroot/repo -l > $testroot/stdout
 
@@ -184,11 +184,11 @@ test_tag_list_lightweight() {
 	tag_id=`got ref -r $testroot/repo -l \
 		| grep "^refs/tags/$tag" | tr -d ' ' | cut -d: -f2`
 	local tagger_time=`git_show_author_time $testroot/repo $tag`
-	d1=`date -u -r $tagger_time +"%a %b %e %X %Y UTC"`
+	d1=`env LC_TIME=C date -u -d "@$tagger_time" +"%a %b %e %X %Y UTC"`
 	tag_id2=`got ref -r $testroot/repo -l \
 		| grep "^refs/tags/$tag2" | tr -d ' ' | cut -d: -f2`
 	local tagger_time2=`git_show_author_time $testroot/repo $tag2`
-	d2=`date -u -r $tagger_time2 +"%a %b %e %X %Y UTC"`
+	d2=`env LC_TIME=C date -u -d "@$tagger_time2" +"%a %b %e %X %Y UTC"`
 
 	got tag -r $testroot/repo -l > $testroot/stdout