Update the emoji test

jonas · May 20, 2018 · e2e5932 · e2e5932
1 parent 5ed922b
commit e2e5932
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/test/main/emoji-test b/test/main/emoji-test
@@ -3,6 +3,10 @@
 . libtest.sh
 . libgit.sh
 
+case "$(uname -s)" in CYGWIN*)
+	test_skip "Emojis are not well supported on CYGWIN"
+esac
+
 export LINES=10
 
 tigrc <<EOF
@@ -25,26 +29,21 @@ git_init
 test_case emoji-commit-titles-col-46 \
 	--subshell='export COLUMNS=46' \
 	<<EOF
-2009-04-06 01:44 +0000 Committer o [master] 🌏💧
-2009-03-28 13:22 +0000 Committer o 💄 Polish th
+2009-04-06 01:44 +0000 Committer o [master] 🌏
+2009-03-28 13:22 +0000 Committer o 💄 Polish t
 2009-03-20 01:00 +0000 Committer o 📚 Document
 2009-03-11 12:38 +0000 Committer o 🎨 Reformat
-2009-03-03 00:15 +0000 Committer o ✨ Add new f
-2009-02-22 11:53 +0000 Committer o 🐧 Fix Linux
+2009-03-03 00:15 +0000 Committer o ✨ Add new 
+2009-02-22 11:53 +0000 Committer o 🐧 Fix Linu
 2009-02-13 23:31 +0000 Committer I 🚑 Fix bug
  
 [main] 50a10e108b44c34548b9ba9e318416b3027100%
 EOF
 
-# platform-specific failures:
-# - fails in Travis environment, both gcc/clang
-# - fails on Ubuntu 16.04 x86_64, gcc
-# - passes on OS X 10.11.6, both gcc/clang
 test_case emoji-commit-titles-col-unset \
-	--subshell='export COLUMNS=' \
-	--todo="Can't unset COLUMNS on Linux for line including VARIATION SELECTOR-16" \
+	--subshell='unset COLUMNS' \
 	<<EOF
-2009-04-06 01:44 +0000 Committer o [master] 🌏💧✋🕋🗡🚀🏜☀️🌡🌶💯🚱⏳🌅🌑😡💉😱😈💀💥🌛🌙🐭💥🚶🏻〰🐛️⌛️👳🙏💥😴🛌😳💥🐛
+2009-04-06 01:44 +0000 Committer o [master] 🌏💧✋🕋🗡🚀🏜☀️🌡🌶💯🚱⏳🌅🌑😡💉😱
 2009-03-28 13:22 +0000 Committer o 💄 Polish the UI
 2009-03-20 01:00 +0000 Committer o 📚 Document new feature
 2009-03-11 12:38 +0000 Committer o 🎨 Reformat the code
@@ -55,12 +54,10 @@ test_case emoji-commit-titles-col-unset \
 [main] 50a10e108b44c34548b9ba9e318416b3027a0627 - commit 1 of 7             100%
 EOF
 
-# fails on both Linux and OS X
 test_case emoji-commit-titles-col-300 \
 	--subshell='export COLUMNS=300' \
-	--todo="Can't set COLUMNS to finite value large enough to include VARIATION SELECTOR-16" \
 	<<EOF
-2009-04-06 01:44 +0000 Committer o [master] 🌏💧✋🕋🗡🚀🏜☀️🌡🌶💯🚱⏳🌅🌑😡💉😱😈💀💥🌛🌙🐭💥🚶🏻〰🐛️⌛️👳🙏💥😴🛌😳💥🐛
+2009-04-06 01:44 +0000 Committer o [master] 🌏💧✋🕋🗡🚀🏜☀️🌡🌶💯🚱⏳🌅🌑😡💉😱😈💀💥🌛🌙🐭💥🚶🏻〰🐛️⌛️👳🙏💥😴🛌😳💥🐛💥👊⚔👑 
 2009-03-28 13:22 +0000 Committer o 💄 Polish the UI
 2009-03-20 01:00 +0000 Committer o 📚 Document new feature
 2009-03-11 12:38 +0000 Committer o 🎨 Reformat the code