Fix flaky test

Sub-second timestamps didn't show up until ninja 1.9.0, and even then
are limited based on filesystem support. Now that we've got a parallel
test runner, a few sleeps isn't a big deal.

Change-Id: Ic6616515b604d9cfa69845f7ceb124cb01c2c8b3

5 files changed, 9 insertions, 32 deletions

diff --git a/.github/workflows/cpp-ci.yml b/.github/workflows/cpp-ci.yml
index 022deeb..5e86550 100644
--- a/.github/workflows/cpp-ci.yml
+++ b/.github/workflows/cpp-ci.yml
@@ -20,7 +20,7 @@ jobs:
     - name: install ninja
       run: |
         mkdir -p ${GITHUB_WORKSPACE}/ninja-bin; cd ${GITHUB_WORKSPACE}/ninja-bin
-        wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
+        wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip
         unzip ninja-linux.zip
         rm ninja-linux.zip
         echo "::add-path::${GITHUB_WORKSPACE}/ninja-bin"
diff --git a/testcase/ninja_regen.sh b/testcase/ninja_regen.sh
index b63bb9b..73ef34a 100755
--- a/testcase/ninja_regen.sh
+++ b/testcase/ninja_regen.sh
@@ -19,12 +19,6 @@ set -e
 log=/tmp/log
 mk="$@"
 
-sleep_if_necessary() {
-  if [ x$(uname) != x"Linux" -o x"${TRAVIS}" != x"" ]; then
-    sleep "$@"
-  fi
-}
-
 export VAR=hoge
 
 cat <<EOF > Makefile
@@ -37,7 +31,7 @@ if [ -e ninja.sh ]; then
   ./ninja.sh
 fi
 
-sleep_if_necessary 1
+sleep 1
 cat <<EOF > Makefile
 \$(KATI_deprecated_var VAR4)
 \$(KATI_obsolete_var VAR5)
@@ -123,7 +117,7 @@ if [ -e ninja.sh ]; then
   ./ninja.sh
 fi
 
-sleep_if_necessary 1
+sleep 1
 touch PASS.mk
 ${mk} 2> ${log}
 if [ -e ninja.sh ]; then
@@ -133,7 +127,7 @@ if [ -e ninja.sh ]; then
   ./ninja.sh
 fi
 
-sleep_if_necessary 1
+sleep 1
 touch XXX
 ${mk} 2> ${log}
 if [ -e ninja.sh ]; then
diff --git a/testcase/ninja_regen_filefunc_read.sh b/testcase/ninja_regen_filefunc_read.sh
index 01fb7e6..ce26614 100755
--- a/testcase/ninja_regen_filefunc_read.sh
+++ b/testcase/ninja_regen_filefunc_read.sh
@@ -19,12 +19,6 @@ set -e
 log=/tmp/log
 mk="$@"
 
-sleep_if_necessary() {
-  if [ x$(uname) != x"Linux" -o x"${TRAVIS}" != x"" ]; then
-    sleep "$@"
-  fi
-}
-
 cat <<EOF > Makefile
 # Make 4.1 does not support file reading, which was added in 4.2
 # We don't actually care though, since we're just testing kati's regen
@@ -48,12 +42,13 @@ if [ -e ninja.sh ]; then
   ./ninja.sh
 fi
 
+sleep 1
 echo regen >file_a
 
 ${mk} 2> ${log}
 if [ -e ninja.sh ]; then
   if ! grep regenerating ${log} >/dev/null; then
-    echo 'Should be regenerated'
+    echo 'Should be regenerated (file add)'
   fi
   ./ninja.sh
 fi
@@ -66,13 +61,13 @@ if [ -e ninja.sh ]; then
   ./ninja.sh
 fi
 
-sleep_if_necessary 1
+sleep 1
 echo regen >>file_a
 
 ${mk} 2> ${log}
 if [ -e ninja.sh ]; then
   if ! grep regenerating ${log} >/dev/null; then
-    echo 'Should be regenerated'
+    echo 'Should be regenerated (file change)'
   fi
   ./ninja.sh
 fi
diff --git a/testcase/ninja_regen_find_link.sh b/testcase/ninja_regen_find_link.sh
index 657f8ae..f9fc7e3 100755
--- a/testcase/ninja_regen_find_link.sh
+++ b/testcase/ninja_regen_find_link.sh
@@ -16,12 +16,6 @@
 
 set -e
 
-sleep_if_necessary() {
-  if [ x"${TRAVIS}" != x"" ]; then
-    sleep "$@"
-  fi
-}
-
 mk="$@"
 if echo "${mk}" | grep kati > /dev/null; then
   mk="${mk} --use_find_emulator"
@@ -42,7 +36,7 @@ touch dir1/file1 dir2/file2
 ln -s ../../dir1 linkdir/d/link
 build
 
-sleep_if_necessary 1
+sleep 1
 touch dir1/file1_2
 build
 
diff --git a/testcase/ninja_regen_glob.sh b/testcase/ninja_regen_glob.sh
index 71dca29..ae73c9b 100755
--- a/testcase/ninja_regen_glob.sh
+++ b/testcase/ninja_regen_glob.sh
@@ -19,12 +19,6 @@ set -e
 log=/tmp/log
 mk="$@"
 
-sleep_if_necessary() {
-  if [ x$(uname) != x"Linux" -o x"${TRAVIS}" != x"" ]; then
-    sleep "$@"
-  fi
-}
-
 touch xe.mk yc.mk xa.mk yb.mk xd.mk
 
 cat <<EOF > Makefile