From 8fb70c5e4aab1d3c2496ff0d5d13520b632ed962 Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Tue, 15 Sep 2020 22:11:14 +0900
Subject: [PATCH] Fix expandtab settings for tests

This matches the main source.
---
 test/Makefile.am                   | 4 ++--
 test/filter-suite-log.sh           | 4 ++--
 test/integration-test-common.sh    | 4 ++--
 test/integration-test-main.sh      | 4 ++--
 test/mergedir.sh                   | 4 ++--
 test/require-root.sh               | 4 ++--
 test/run_tests_using_sanitizers.sh | 4 ++--
 test/sample_delcache.sh            | 4 ++--
 test/small-integration-test.sh     | 4 ++--
 test/test-utils.sh                 | 4 ++--
 test/ut_test.py                    | 4 ++--
 test/write_multiple_offsets.py     | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 2bd2be7..7fb7c0f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -35,6 +35,6 @@ testdir = test
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/filter-suite-log.sh b/test/filter-suite-log.sh
index 8cdb2ef..532c91b 100755
--- a/test/filter-suite-log.sh
+++ b/test/filter-suite-log.sh
@@ -136,6 +136,6 @@ exit 0
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/integration-test-common.sh b/test/integration-test-common.sh
index fd68ed4..c4c0c4d 100644
--- a/test/integration-test-common.sh
+++ b/test/integration-test-common.sh
@@ -282,6 +282,6 @@ trap common_exit_handler EXIT
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/integration-test-main.sh b/test/integration-test-main.sh
index 7b918eb..ac6449c 100755
--- a/test/integration-test-main.sh
+++ b/test/integration-test-main.sh
@@ -1084,6 +1084,6 @@ run_suite
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/mergedir.sh b/test/mergedir.sh
index 90c433d..05d60c8 100755
--- a/test/mergedir.sh
+++ b/test/mergedir.sh
@@ -189,6 +189,6 @@ echo `date` >> $LOGFILE
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/require-root.sh b/test/require-root.sh
index 4a6e177..70adfcb 100755
--- a/test/require-root.sh
+++ b/test/require-root.sh
@@ -30,6 +30,6 @@ fi
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/run_tests_using_sanitizers.sh b/test/run_tests_using_sanitizers.sh
index 6c9a95f..e7c7730 100755
--- a/test/run_tests_using_sanitizers.sh
+++ b/test/run_tests_using_sanitizers.sh
@@ -52,6 +52,6 @@ RETRIES=200 VALGRIND='--error-exitcode=1 --leak-check=full' make check -C test/
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/sample_delcache.sh b/test/sample_delcache.sh
index 0e5c7a2..dca66e8 100755
--- a/test/sample_delcache.sh
+++ b/test/sample_delcache.sh
@@ -126,6 +126,6 @@ exit 0
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/small-integration-test.sh b/test/small-integration-test.sh
index e429906..69201f4 100755
--- a/test/small-integration-test.sh
+++ b/test/small-integration-test.sh
@@ -88,6 +88,6 @@ echo "$0: tests complete."
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/test-utils.sh b/test/test-utils.sh
index 5414069..7103e8b 100644
--- a/test/test-utils.sh
+++ b/test/test-utils.sh
@@ -304,6 +304,6 @@ function aws_cli() {
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #
diff --git a/test/ut_test.py b/test/ut_test.py
index 07befcf..a3abcd6 100755
--- a/test/ut_test.py
+++ b/test/ut_test.py
@@ -103,6 +103,6 @@ if __name__ == '__main__':
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 # 
diff --git a/test/write_multiple_offsets.py b/test/write_multiple_offsets.py
index d8db563..bdfb821 100755
--- a/test/write_multiple_offsets.py
+++ b/test/write_multiple_offsets.py
@@ -41,6 +41,6 @@ finally:
 # tab-width: 4
 # c-basic-offset: 4
 # End:
-# vim600: noet sw=4 ts=4 fdm=marker
-# vim<600: noet sw=4 ts=4
+# vim600: expandtab sw=4 ts=4 fdm=marker
+# vim<600: expandtab sw=4 ts=4
 #