diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-08-30 21:46:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-08-30 21:46:08 +0100 |
| commit | 61abe7d8f827ec31f098e8abcdf58846b956ef16 (patch) | |
| tree | 0cf4ec692b77aeb1be2c1a38d3ff32973aaca45e | |
| parent | 9b03d3e75b4274493bbe76772d7b92238791964c (diff) | |
| download | vim-git-61abe7d8f827ec31f098e8abcdf58846b956ef16.tar.gz | |
patch 9.0.0336: tests are flaky because of using a common file namev9.0.0336
Problem: Tests are flaky because of using a common file name.
Solution: Rename files and directories to be more unique.
38 files changed, 175 insertions, 173 deletions
diff --git a/src/testdir/dumps/Test_diff_01.dump b/src/testdir/dumps/Test_diff_01.dump index ba2efbd00..125c391b0 100644 --- a/src/testdir/dumps/Test_diff_01.dump +++ b/src/testdir/dumps/Test_diff_01.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_02.dump b/src/testdir/dumps/Test_diff_02.dump index 12af17526..a2a185265 100644 --- a/src/testdir/dumps/Test_diff_02.dump +++ b/src/testdir/dumps/Test_diff_02.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_03.dump b/src/testdir/dumps/Test_diff_03.dump index ba12b3d5d..5832eece0 100644 --- a/src/testdir/dumps/Test_diff_03.dump +++ b/src/testdir/dumps/Test_diff_03.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_04.dump b/src/testdir/dumps/Test_diff_04.dump index 5d959e7da..84fa6f77d 100644 --- a/src/testdir/dumps/Test_diff_04.dump +++ b/src/testdir/dumps/Test_diff_04.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_05.dump b/src/testdir/dumps/Test_diff_05.dump index 19a40f22f..7bffa1afb 100644 --- a/src/testdir/dumps/Test_diff_05.dump +++ b/src/testdir/dumps/Test_diff_05.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_06.0.dump b/src/testdir/dumps/Test_diff_06.0.dump index 2032fbadb..458295b00 100644 --- a/src/testdir/dumps/Test_diff_06.0.dump +++ b/src/testdir/dumps/Test_diff_06.0.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|0| @51 diff --git a/src/testdir/dumps/Test_diff_06.1.dump b/src/testdir/dumps/Test_diff_06.1.dump index 8ba2ce9d3..8f2d4fbbd 100644 --- a/src/testdir/dumps/Test_diff_06.1.dump +++ b/src/testdir/dumps/Test_diff_06.1.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|1| @51 diff --git a/src/testdir/dumps/Test_diff_06.2.dump b/src/testdir/dumps/Test_diff_06.2.dump index e9d3f6b5f..c7722706e 100644 --- a/src/testdir/dumps/Test_diff_06.2.dump +++ b/src/testdir/dumps/Test_diff_06.2.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&@1|s|e|t| |d|i|f@1|o|p|t|+|=|c|o|n|t|e|x|t|:|2| @50 diff --git a/src/testdir/dumps/Test_diff_06.dump b/src/testdir/dumps/Test_diff_06.dump index e589fd7c6..a5e6348a8 100644 --- a/src/testdir/dumps/Test_diff_06.dump +++ b/src/testdir/dumps/Test_diff_06.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_07.dump b/src/testdir/dumps/Test_diff_07.dump index 97864c68d..c8f2aa67f 100644 --- a/src/testdir/dumps/Test_diff_07.dump +++ b/src/testdir/dumps/Test_diff_07.dump @@ -16,5 +16,5 @@ | +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|i+0#0000000#5fd7ff255|n|t| |f|r|o|b|n|i|t|z|(|i|n|t| |f|o@1|)| @13 | +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|{+0#0000000#ffffff0| @33 | +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|f+2&#ff404010|(|n| |>| |1|)| +0&#ffd7ff255@21||+1&#ffffff0| +0#0000e05#a8a8a8255@1| +0#0000000#ffd7ff255@3|i|n+2&#ff404010|t| |i|;| +0&#ffd7ff255@24 -|X+3&#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p +|X+3&#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 diff --git a/src/testdir/dumps/Test_diff_08.dump b/src/testdir/dumps/Test_diff_08.dump index 6445a5776..a8392df42 100644 --- a/src/testdir/dumps/Test_diff_08.dump +++ b/src/testdir/dumps/Test_diff_08.dump @@ -16,5 +16,5 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 -|X+3#0000000#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p +|X+3#0000000#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|p|a|t|i|e|n|c|e| @42 diff --git a/src/testdir/dumps/Test_diff_09.dump b/src/testdir/dumps/Test_diff_09.dump index 95692b62a..700d30c2e 100644 --- a/src/testdir/dumps/Test_diff_09.dump +++ b/src/testdir/dumps/Test_diff_09.dump @@ -16,5 +16,5 @@ | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|f|o|r|(|i| |=| |0|;| |i| |<| |1|0|;| |i|+@1|)| @7 | +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@3|{| @29 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@7|p|r|i|n|t|f|(|"|Y|o|u|r| |a|n|s|w|e|r| |i|s|:| |"|)|;||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34 -|X+3#0000000#ffffff0|f|i|l|e|1| @12|1|,|1| @11|T|o|p| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|T|o|p +|X+3#0000000#ffffff0|d|i|f|i|l|e|1| @10|1|,|1| @11|T|o|p| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|T|o|p |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|a|l|g|o|r|i|t|h|m|:|h|i|s|t|o|g|r|a|m| @41 diff --git a/src/testdir/dumps/Test_diff_10.dump b/src/testdir/dumps/Test_diff_10.dump index 8eff1479c..8bc91fb8b 100644 --- a/src/testdir/dumps/Test_diff_10.dump +++ b/src/testdir/dumps/Test_diff_10.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|0|-|1| @9|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|0|-|1| @9|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 diff --git a/src/testdir/dumps/Test_diff_11.dump b/src/testdir/dumps/Test_diff_11.dump index b424b88fb..216c66b51 100644 --- a/src/testdir/dumps/Test_diff_11.dump +++ b/src/testdir/dumps/Test_diff_11.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|0|-|1| @9|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|0|-|1| @9|A|l@1 |:+0&&| @73 diff --git a/src/testdir/dumps/Test_diff_12.dump b/src/testdir/dumps/Test_diff_12.dump index 43d65d641..dd29b9fe1 100644 --- a/src/testdir/dumps/Test_diff_12.dump +++ b/src/testdir/dumps/Test_diff_12.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_13.dump b/src/testdir/dumps/Test_diff_13.dump index dbb9ffa8b..b93fba7fb 100644 --- a/src/testdir/dumps/Test_diff_13.dump +++ b/src/testdir/dumps/Test_diff_13.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|0|,|0|-|1| @9|A|l@1| |X+1&&|f|i|l|e|2| @12|0|,|0|-|1| @9|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|0|,|0|-|1| @9|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|0|,|0|-|1| @9|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_14.dump b/src/testdir/dumps/Test_diff_14.dump index 8f51b1904..c2418982c 100644 --- a/src/testdir/dumps/Test_diff_14.dump +++ b/src/testdir/dumps/Test_diff_14.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_15.dump b/src/testdir/dumps/Test_diff_15.dump index 3b880ebc5..6a65c2d4e 100644 --- a/src/testdir/dumps/Test_diff_15.dump +++ b/src/testdir/dumps/Test_diff_15.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|&|v|i|m| |d|i|f@1|o|p|t|+|=|f|i|l@1|e|r| |d|i|f@1|o|p|t|+|=|i|w|h|i|t|e| @26 diff --git a/src/testdir/dumps/Test_diff_16.dump b/src/testdir/dumps/Test_diff_16.dump index 95d77a805..5121bc98f 100644 --- a/src/testdir/dumps/Test_diff_16.dump +++ b/src/testdir/dumps/Test_diff_16.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&|s|e|t| |d|i|f@1|o|p|t|+|=|i|n|t|e|r|n|a|l| @52 diff --git a/src/testdir/dumps/Test_diff_17.dump b/src/testdir/dumps/Test_diff_17.dump index 24432cd3c..f1cd41f0b 100644 --- a/src/testdir/dumps/Test_diff_17.dump +++ b/src/testdir/dumps/Test_diff_17.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_18.dump b/src/testdir/dumps/Test_diff_18.dump index 57ce82c3f..5fd231c69 100644 --- a/src/testdir/dumps/Test_diff_18.dump +++ b/src/testdir/dumps/Test_diff_18.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_19.dump b/src/testdir/dumps/Test_diff_19.dump index 587544ae0..82543dfa7 100644 --- a/src/testdir/dumps/Test_diff_19.dump +++ b/src/testdir/dumps/Test_diff_19.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_diff_20.dump b/src/testdir/dumps/Test_diff_20.dump index fc8ce15f6..1180de665 100644 --- a/src/testdir/dumps/Test_diff_20.dump +++ b/src/testdir/dumps/Test_diff_20.dump @@ -16,5 +16,5 @@ |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |~| @35||+1#0000000&|~+0#4040ff13&| @35 -|X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1 +|X+3#0000000&|d|i|f|i|l|e|1| @10|1|,|1| @11|A|l@1| |X+1&&|d|i|f|i|l|e|2| @10|1|,|1| @11|A|l@1 |:+0&&> @73 diff --git a/src/testdir/dumps/Test_wildmenu_pum_14.dump b/src/testdir/dumps/Test_wildmenu_pum_14.dump index 78da67f40..7f5546b6e 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_14.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_14.dump @@ -5,6 +5,6 @@ |~| @73 |~| @73 |~| @73 -|~| @5| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@51 -|~| @5| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@51 -|:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/> @60 +|~| @9| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@47 +|~| @9| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@47 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/> @56 diff --git a/src/testdir/dumps/Test_wildmenu_pum_15.dump b/src/testdir/dumps/Test_wildmenu_pum_15.dump index fa4f50b2f..59f1fc5cb 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_15.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_15.dump @@ -5,6 +5,6 @@ |~| @73 |~| @73 |~| @73 -|~| @11| +0#0000001#e0e0e08|X|d|i|r|B|/| @8| +0#4040ff13#ffffff0@45 -|~| @11| +0#0000001#ffd7ff255|X|f|i|l|e|B| @8| +0#4040ff13#ffffff0@45 -|:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/|X|d|i|r|B|/> @54 +|~| @15| +0#0000001#e0e0e08|X|d|i|r|B|/| @8| +0#4040ff13#ffffff0@41 +|~| @15| +0#0000001#ffd7ff255|X|f|i|l|e|B| @8| +0#4040ff13#ffffff0@41 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/|X|d|i|r|B|/> @50 diff --git a/src/testdir/dumps/Test_wildmenu_pum_16.dump b/src/testdir/dumps/Test_wildmenu_pum_16.dump index 78da67f40..7f5546b6e 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_16.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_16.dump @@ -5,6 +5,6 @@ |~| @73 |~| @73 |~| @73 -|~| @5| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@51 -|~| @5| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@51 -|:+0#0000000&|e| |X|d|i|r|/|X|d|i|r|A|/> @60 +|~| @9| +0#0000001#e0e0e08|X|d|i|r|A|/| @8| +0#4040ff13#ffffff0@47 +|~| @9| +0#0000001#ffd7ff255|X|f|i|l|e|A| @8| +0#4040ff13#ffffff0@47 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|X|d|i|r|A|/> @56 diff --git a/src/testdir/dumps/Test_wildmenu_pum_32.dump b/src/testdir/dumps/Test_wildmenu_pum_32.dump index a8a0dfe5c..9bff1a57d 100644 --- a/src/testdir/dumps/Test_wildmenu_pum_32.dump +++ b/src/testdir/dumps/Test_wildmenu_pum_32.dump @@ -4,7 +4,7 @@ |~| @73 |~| @73 |~| @73 -|~| @12| +0#0000001#e0e0e08|1|2|3| @11| +0#4040ff13#ffffff0@44 -|~| @12| +0#0000001#ffd7ff255|a|b|c| @11| +0#4040ff13#ffffff0@44 -|~| @12| +0#0000001#ffd7ff255|x|y|z| @11| +0#4040ff13#ffffff0@44 -|:+0#0000000&|e| |X|d|i|r|/|あ*&|い|う|/+&|1|2|3> @56 +|~| @16| +0#0000001#e0e0e08|1|2|3| @11| +0#4040ff13#ffffff0@40 +|~| @16| +0#0000001#ffd7ff255|a|b|c| @11| +0#4040ff13#ffffff0@40 +|~| @16| +0#0000001#ffd7ff255|x|y|z| @11| +0#4040ff13#ffffff0@40 +|:+0#0000000&|e| |X|n|a|m|e|d|i|r|/|あ*&|い|う|/+&|1|2|3> @52 diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index b3b4ec5a6..737dd0bd0 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2229,7 +2229,7 @@ function Test_dirchanged_auto() set acd cd .. call assert_equal([], s:li) - exe 'edit ' . s:dir_foo . '/Xfile' + exe 'edit ' . s:dir_foo . '/Xautofile' call assert_equal(s:dir_foo, getcwd()) let expected = ["pre cd " .. s:dir_foo, "auto:", s:dir_foo] call assert_equal(expected, s:li) @@ -2906,7 +2906,7 @@ func Test_FileChangedRO_winclose() augroup FileChangedROTest au! - autocmd FileChangedRO * edit Xfile + autocmd FileChangedRO * edit Xrofile augroup END new set readonly @@ -2982,13 +2982,13 @@ endfunc " Test for passing invalid arguments to autocmd func Test_autocmd_invalid_args() " Additional character after * for event - call assert_fails('autocmd *a Xfile set ff=unix', 'E215:') + call assert_fails('autocmd *a Xinvfile set ff=unix', 'E215:') augroup Test augroup END " Invalid autocmd event - call assert_fails('autocmd Bufabc Xfile set ft=vim', 'E216:') + call assert_fails('autocmd Bufabc Xinvfile set ft=vim', 'E216:') " Invalid autocmd event in a autocmd group - call assert_fails('autocmd Test Bufabc Xfile set ft=vim', 'E216:') + call assert_fails('autocmd Test Bufabc Xinvfile set ft=vim', 'E216:') augroup! Test " Execute all autocmds call assert_fails('doautocmd * BufEnter', 'E217:') @@ -2999,9 +2999,9 @@ endfunc " Test for deep nesting of autocmds func Test_autocmd_deep_nesting() - autocmd BufEnter Xfile doautocmd BufEnter Xfile - call assert_fails('doautocmd BufEnter Xfile', 'E218:') - autocmd! BufEnter Xfile + autocmd BufEnter Xdeepfile doautocmd BufEnter Xdeepfile + call assert_fails('doautocmd BufEnter Xdeepfile', 'E218:') + autocmd! BufEnter Xdeepfile endfunc " Tests for SigUSR1 autocmd event, which is only available on posix systems. diff --git a/src/testdir/test_buffer.vim b/src/testdir/test_buffer.vim index c7dd13688..0d1741d64 100644 --- a/src/testdir/test_buffer.vim +++ b/src/testdir/test_buffer.vim @@ -141,7 +141,7 @@ func Test_bdelete_cmd() call assert_fails('bdelete \)', 'E55:') " Deleting a unlisted and unloaded buffer - edit Xfile1 + edit Xbdelfile1 let bnr = bufnr() set nobuflisted enew @@ -315,8 +315,8 @@ endfunc " Test for trying to load a buffer with text locked " <C-\>e in the command line is used to lock the text func Test_load_buf_with_text_locked() - new Xfile1 - edit Xfile2 + new Xlockfile1 + edit Xlockfile2 let cmd = ":\<C-\>eexecute(\"normal \<C-O>\")\<CR>\<C-C>" call assert_fails("call feedkeys(cmd, 'xt')", 'E565:') %bw! diff --git a/src/testdir/test_changelist.vim b/src/testdir/test_changelist.vim index 3bb22a89b..0d435590a 100644 --- a/src/testdir/test_changelist.vim +++ b/src/testdir/test_changelist.vim @@ -37,13 +37,13 @@ endfunc " Tests for the getchangelist() function func Test_changelist_index() - edit Xfile1.txt + edit Xgclfile1.txt exe "normal iabc\<C-G>u\ndef\<C-G>u\nghi" call assert_equal(3, getchangelist('%')[1]) " Move one step back in the changelist. normal 2g; - hide edit Xfile2.txt + hide edit Xgclfile2.txt exe "normal iabcd\<C-G>u\ndefg\<C-G>u\nghij" call assert_equal(3, getchangelist('%')[1]) " Move to the beginning of the changelist. @@ -54,8 +54,8 @@ func Test_changelist_index() call assert_equal(1, getchangelist('#')[1]) bwipe! - call delete('Xfile1.txt') - call delete('Xfile2.txt') + call delete('Xgclfile1.txt') + call delete('Xgclfile2.txt') endfunc func Test_getchangelist() @@ -64,10 +64,10 @@ func Test_getchangelist() call assert_equal([], 10->getchangelist()) call assert_equal([[], 0], getchangelist()) - call writefile(['line1', 'line2', 'line3'], 'Xfile1.txt') - call writefile(['line1', 'line2', 'line3'], 'Xfile2.txt') + call writefile(['line1', 'line2', 'line3'], 'Xclistfile1.txt') + call writefile(['line1', 'line2', 'line3'], 'Xclistfile2.txt') - edit Xfile1.txt + edit Xclistfile1.txt let buf_1 = bufnr() exe "normal 1Goline\<C-G>u1.1" exe "normal 3Goline\<C-G>u2.1" @@ -79,7 +79,7 @@ func Test_getchangelist() \ {'lnum' : 6, 'col' : 4, 'coladd' : 0}], 2], \ getchangelist('%')) - hide edit Xfile2.txt + hide edit Xclistfile2.txt let buf_2 = bufnr() exe "normal 1GOline\<C-G>u1.0" exe "normal 2Goline\<C-G>u2.0" @@ -100,8 +100,8 @@ func Test_getchangelist() \ getchangelist(buf_2)) bwipe! - call delete('Xfile1.txt') - call delete('Xfile2.txt') + call delete('Xclistfile1.txt') + call delete('Xclistfile2.txt') endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index aebbc2f6e..64c9ab8e8 100644 --- a/src/testdir/test_clientserver.vim +++ b/src/testdir/test_clientserver.vim @@ -130,9 +130,9 @@ func Test_client_server() " Run a separate instance to send a command to the server call remote_expr(name, 'execute("only")') - call system(cmd .. ' --remote-send ":new Xfile<CR>"') + call system(cmd .. ' --remote-send ":new Xclientfile<CR>"') call assert_equal('2', remote_expr(name, 'winnr("$")')) - call assert_equal('Xfile', remote_expr(name, 'winbufnr(1)->bufname()')) + call assert_equal('Xclientfile', remote_expr(name, 'winbufnr(1)->bufname()')) call remote_expr(name, 'execute("only")') " Invoke a remote-expr. On MS-Windows, the returned value has a carriage @@ -141,24 +141,24 @@ func Test_client_server() call assert_equal(['4'], split(l, "\n")) " Edit multiple files using --remote - call system(cmd .. ' --remote Xfile1 Xfile2 Xfile3') - call assert_match(".*Xfile1\n.*Xfile2\n.*Xfile3\n", remote_expr(name, 'argv()')) + call system(cmd .. ' --remote Xclientfile1 Xclientfile2 Xclientfile3') + call assert_match(".*Xclientfile1\n.*Xclientfile2\n.*Xclientfile3\n", remote_expr(name, 'argv()')) eval name->remote_send(":%bw!\<CR>") " Edit files in separate tab pages - call system(cmd .. ' --remote-tab Xfile1 Xfile2 Xfile3') + call system(cmd .. ' --remote-tab Xclientfile1 Xclientfile2 Xclientfile3') call WaitForAssert({-> assert_equal('3', remote_expr(name, 'tabpagenr("$")'))}) - call assert_match('.*\<Xfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])')) + call assert_match('.*\<Xclientfile2', remote_expr(name, 'bufname(tabpagebuflist(2)[0])')) eval name->remote_send(":%bw!\<CR>") " Edit a file using --remote-wait eval name->remote_send(":source $VIMRUNTIME/plugin/rrhelper.vim\<CR>") - call system(cmd .. ' --remote-wait +enew Xfile1') - call assert_match('.*\<Xfile1', remote_expr(name, 'bufname("#")')) + call system(cmd .. ' --remote-wait +enew Xclientfile1') + call assert_match('.*\<Xclientfile1', remote_expr(name, 'bufname("#")')) eval name->remote_send(":%bw!\<CR>") " Edit files using --remote-tab-wait - call system(cmd .. ' --remote-tabwait +tabonly\|enew Xfile1 Xfile2') + call system(cmd .. ' --remote-tabwait +tabonly\|enew Xclientfile1 Xclientfile2') call assert_equal('1', remote_expr(name, 'tabpagenr("$")')) eval name->remote_send(":%bw!\<CR>") diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index cad5f9b49..95db663bd 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -1035,14 +1035,14 @@ func Test_cmdline_complete_various() call assert_equal("\"sI \<C-A>", @:) " completion for :write command - call mkdir('Xdir') - call writefile(['one'], 'Xdir/Xfile1') + call mkdir('Xcwdir') + call writefile(['one'], 'Xcwdir/Xfile1') let save_cwd = getcwd() - cd Xdir + cd Xcwdir call feedkeys(":w >> \<C-A>\<C-B>\"\<CR>", 'xt') call assert_equal("\"w >> Xfile1", @:) call chdir(save_cwd) - call delete('Xdir', 'rf') + call delete('Xcwdir', 'rf') " completion for :w ! and :r ! commands call feedkeys(":w !invalid_xyz_cmd\<C-A>\<C-B>\"\<CR>", 'xt') @@ -1121,12 +1121,12 @@ func Test_cmdline_complete_various() call assert_equal("\"doautocmd BufNew,BufEnter", @:) " completion of file name in :doautocmd - call writefile([], 'Xfile1') - call writefile([], 'Xfile2') - call feedkeys(":doautocmd BufEnter Xfi\<C-A>\<C-B>\"\<CR>", 'xt') - call assert_equal("\"doautocmd BufEnter Xfile1 Xfile2", @:) - call delete('Xfile1') - call delete('Xfile2') + call writefile([], 'Xvarfile1') + call writefile([], 'Xvarfile2') + call feedkeys(":doautocmd BufEnter Xvarfi\<C-A>\<C-B>\"\<CR>", 'xt') + call assert_equal("\"doautocmd BufEnter Xvarfile1 Xvarfile2", @:) + call delete('Xvarfile1') + call delete('Xvarfile2') " completion for the :augroup command augroup XTest.test @@ -1603,17 +1603,17 @@ endfunc " Test for using ~ for home directory in cmdline completion matches func Test_cmdline_expand_home() - call mkdir('Xdir') - call writefile([], 'Xdir/Xfile1') - call writefile([], 'Xdir/Xfile2') - cd Xdir + call mkdir('Xexpdir') + call writefile([], 'Xexpdir/Xfile1') + call writefile([], 'Xexpdir/Xfile2') + cd Xexpdir let save_HOME = $HOME let $HOME = getcwd() call feedkeys(":e ~/\<C-A>\<C-B>\"\<CR>", 'xt') call assert_equal('"e ~/Xfile1 ~/Xfile2', @:) let $HOME = save_HOME cd .. - call delete('Xdir', 'rf') + call delete('Xexpdir', 'rf') endfunc " Test for using CTRL-\ CTRL-G in the command line to go back to normal mode @@ -1734,15 +1734,15 @@ func Test_wildmode() endfunc func Test_custom_complete_autoload() - call mkdir('Xdir/autoload', 'p') + call mkdir('Xcustdir/autoload', 'p') let save_rtp = &rtp - exe 'set rtp=' .. getcwd() .. '/Xdir' + exe 'set rtp=' .. getcwd() .. '/Xcustdir' let lines =<< trim END func vim8#Complete(a, c, p) return "oneA\noneB\noneC" endfunc END - call writefile(lines, 'Xdir/autoload/vim8.vim') + call writefile(lines, 'Xcustdir/autoload/vim8.vim') command -nargs=1 -complete=custom,vim8#Complete MyCmd set nowildmenu @@ -1753,7 +1753,7 @@ func Test_custom_complete_autoload() let &rtp = save_rtp set wildmode& wildmenu& delcommand MyCmd - call delete('Xdir', 'rf') + call delete('Xcustdir', 'rf') endfunc " Test for interrupting the command-line completion @@ -2038,31 +2038,31 @@ endfunc " Test for the 'suffixes' option func Test_suffixes_opt() - call writefile([], 'Xfile') - call writefile([], 'Xfile.c') - call writefile([], 'Xfile.o') + call writefile([], 'Xsuffile') + call writefile([], 'Xsuffile.c') + call writefile([], 'Xsuffile.o') set suffixes= - call feedkeys(":e Xfi*\<C-A>\<C-B>\"\<CR>", 'xt') - call assert_equal('"e Xfile Xfile.c Xfile.o', @:) - call feedkeys(":e Xfi*\<Tab>\<Tab>\<C-B>\"\<CR>", 'xt') - call assert_equal('"e Xfile.c', @:) + call feedkeys(":e Xsuffi*\<C-A>\<C-B>\"\<CR>", 'xt') + call assert_equal('"e Xsuffile Xsuffile.c Xsuffile.o', @:) + call feedkeys(":e Xsuffi*\<Tab>\<Tab>\<C-B>\"\<CR>", 'xt') + call assert_equal('"e Xsuffile.c', @:) set suffixes=.c - call feedkeys(":e Xfi*\<C-A>\<C-B>\"\<CR>", 'xt') - call assert_equal('"e Xfile Xfile.o Xfile.c', @:) - call feedkeys(":e Xfi*\<Tab>\<Tab>\<C-B>\"\<CR>", 'xt') - call assert_equal('"e Xfile.o', @:) + call feedkeys(":e Xsuffi*\<C-A>\<C-B>\"\<CR>", 'xt') + call assert_equal('"e Xsuffile Xsuffile.o Xsuffile.c', @:) + call feedkeys(":e Xsuffi*\<Tab>\<Tab>\<C-B>\"\<CR>", 'xt') + call assert_equal('"e Xsuffile.o', @:) set suffixes=,, - call feedkeys(":e Xfi*\<C-A>\<C-B>\"\<CR>", 'xt') - call assert_equal('"e Xfile.c Xfile.o Xfile', @:) - call feedkeys(":e Xfi*\<Tab>\<Tab>\<C-B>\"\<CR>", 'xt') - call assert_equal('"e Xfile.o', @:) + call feedkeys(":e Xsuffi*\<C-A>\<C-B>\"\<CR>", 'xt') + call assert_equal('"e Xsuffile.c Xsuffile.o Xsuffile', @:) + call feedkeys(":e Xsuffi*\<Tab>\<Tab>\<C-B>\"\<CR>", 'xt') + call assert_equal('"e Xsuffile.o', @:) set suffixes& " Test for getcompletion() with different patterns - call assert_equal(['Xfile', 'Xfile.c', 'Xfile.o'], getcompletion('Xfile', 'file')) - call assert_equal(['Xfile'], getcompletion('Xfile$', 'file')) - call delete('Xfile') - call delete('Xfile.c') - call delete('Xfile.o') + call assert_equal(['Xsuffile', 'Xsuffile.c', 'Xsuffile.o'], getcompletion('Xsuffile', 'file')) + call assert_equal(['Xsuffile'], getcompletion('Xsuffile$', 'file')) + call delete('Xsuffile') + call delete('Xsuffile.c') + call delete('Xsuffile.o') endfunc " Test for using a popup menu for the command line completion matches @@ -2162,12 +2162,12 @@ func Test_wildmenu_pum() call VerifyScreenDump(buf, 'Test_wildmenu_pum_13', {}) " Directory name completion - call mkdir('Xdir/XdirA/XdirB', 'p') - call writefile([], 'Xdir/XfileA') - call writefile([], 'Xdir/XdirA/XfileB') - call writefile([], 'Xdir/XdirA/XdirB/XfileC') + call mkdir('Xnamedir/XdirA/XdirB', 'p') + call writefile([], 'Xnamedir/XfileA') + call writefile([], 'Xnamedir/XdirA/XfileB') + call writefile([], 'Xnamedir/XdirA/XdirB/XfileC') - call term_sendkeys(buf, "\<C-U>e Xdi\<Tab>\<Tab>") + call term_sendkeys(buf, "\<C-U>e Xnamedi\<Tab>\<Tab>") call VerifyScreenDump(buf, 'Test_wildmenu_pum_14', {}) " Pressing <Right> on a directory name should go into that directory @@ -2242,13 +2242,13 @@ func Test_wildmenu_pum() call VerifyScreenDump(buf, 'Test_wildmenu_pum_31', {}) " Tests a directory name contained full-width characters. - call mkdir('Xdir/あいう', 'p') - call writefile([], 'Xdir/あいう/abc') - call writefile([], 'Xdir/あいう/xyz') - call writefile([], 'Xdir/あいう/123') + call mkdir('Xnamedir/あいう', 'p') + call writefile([], 'Xnamedir/あいう/abc') + call writefile([], 'Xnamedir/あいう/xyz') + call writefile([], 'Xnamedir/あいう/123') call term_sendkeys(buf, "\<C-U>set wildmode&\<CR>") - call term_sendkeys(buf, ":\<C-U>e Xdir/あいう/\<Tab>") + call term_sendkeys(buf, ":\<C-U>e Xnamedir/あいう/\<Tab>") call VerifyScreenDump(buf, 'Test_wildmenu_pum_32', {}) " Pressing <C-A> when the popup menu is displayed should list all the @@ -2270,7 +2270,7 @@ func Test_wildmenu_pum() " After using <C-A> to expand all the filename matches, pressing <Up> " should not open the popup menu again. - call term_sendkeys(buf, "\<C-E>\<C-U>:cd Xdir/XdirA\<CR>") + call term_sendkeys(buf, "\<C-E>\<C-U>:cd Xnamedir/XdirA\<CR>") call term_sendkeys(buf, ":e \<Tab>\<C-A>\<Up>") call VerifyScreenDump(buf, 'Test_wildmenu_pum_36', {}) call term_sendkeys(buf, "\<C-E>\<C-U>:cd -\<CR>") @@ -2331,7 +2331,7 @@ func Test_wildmenu_pum() call term_sendkeys(buf, "\<C-U>\<CR>") call StopVimInTerminal(buf) call delete('Xtest') - call delete('Xdir', 'rf') + call delete('Xnamedir', 'rf') endfunc " Test for wildmenumode() with the cmdline popup menu diff --git a/src/testdir/test_cpoptions.vim b/src/testdir/test_cpoptions.vim index edb9b4b32..600132d66 100644 --- a/src/testdir/test_cpoptions.vim +++ b/src/testdir/test_cpoptions.vim @@ -31,17 +31,17 @@ func Test_cpo_A() " Wipe out all the buffers, so that the alternate file is empty edit Xfoo | %bw set cpo-=A - new Xfile1 - write Xfile2 + new XcpoAfile1 + write XcpoAfile2 call assert_equal('', @#) %bw - call delete('Xfile2') - new Xfile1 + call delete('XcpoAfile2') + new XcpoAfile1 set cpo+=A - write Xfile2 - call assert_equal('Xfile2', @#) + write XcpoAfile2 + call assert_equal('XcpoAfile2', @#) close! - call delete('Xfile2') + call delete('XcpoAfile2') let &cpo = save_cpo endfunc diff --git a/src/testdir/test_delete.vim b/src/testdir/test_delete.vim index a8d94c3a1..b05c27d62 100644 --- a/src/testdir/test_delete.vim +++ b/src/testdir/test_delete.vim @@ -3,14 +3,14 @@ source check.vim func Test_file_delete() - split Xfile + split Xfdelfile call setline(1, ['a', 'b']) wq - call assert_equal(['a', 'b'], readfile('Xfile')) - call assert_equal(0, delete('Xfile')) - call assert_fails('call readfile("Xfile")', 'E484:') - call assert_equal(-1, delete('Xfile')) - bwipe Xfile + call assert_equal(['a', 'b'], readfile('Xfdelfile')) + call assert_equal(0, delete('Xfdelfile')) + call assert_fails('call readfile("Xfdelfile")', 'E484:') + call assert_equal(-1, delete('Xfdelfile')) + bwipe Xfdelfile endfunc func Test_dir_delete() @@ -44,15 +44,15 @@ endfunc func Test_symlink_delete() CheckUnix - split Xfile + split Xslfile call setline(1, ['a', 'b']) wq - silent !ln -s Xfile Xdellink + silent !ln -s Xslfile Xdellink " Delete the link, not the file call assert_equal(0, delete('Xdellink')) call assert_equal(-1, delete('Xdellink')) - call assert_equal(0, delete('Xfile')) - bwipe Xfile + call assert_equal(0, delete('Xslfile')) + bwipe Xslfile endfunc func Test_symlink_dir_delete() diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index 3c9fbec6e..8cb506099 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -822,8 +822,8 @@ func Test_diff_lastline() endfunc func WriteDiffFiles(buf, list1, list2) - call writefile(a:list1, 'Xfile1') - call writefile(a:list2, 'Xfile2') + call writefile(a:list1, 'Xdifile1') + call writefile(a:list2, 'Xdifile2') if a:buf call term_sendkeys(a:buf, ":checktime\<CR>") endif @@ -877,12 +877,12 @@ func Test_diff_screen() call writefile(lines, 'XdiffSetup') " clean up already existing swap files, just in case - call delete('.Xfile1.swp') - call delete('.Xfile2.swp') + call delete('.Xdifile1.swp') + call delete('.Xdifile2.swp') " Test 1: Add a line in beginning of file 2 call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]) - let buf = RunVimInTerminal('-d -S XdiffSetup Xfile1 Xfile2', {}) + let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {}) " Set autoread mode, so that Vim won't complain once we re-write the test " files call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w") @@ -1000,8 +1000,8 @@ func Test_diff_screen() " clean up call StopVimInTerminal(buf) - call delete('Xfile1') - call delete('Xfile2') + call delete('Xdifile1') + call delete('Xdifile2') call delete('XdiffSetup') endfunc @@ -1494,9 +1494,9 @@ endfunc " for the issue fixed by patch 6.2.317) func Test_diff_foldinvert() %bw! - edit Xfile1 - new Xfile2 - new Xfile3 + edit Xdoffile1 + new Xdoffile2 + new Xdoffile3 windo diffthis " open a non-diff window botright new diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim index a568fb2dc..a2d2b5e78 100644 --- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -424,7 +424,7 @@ endfunc " terminal. func Test_autoindent_remove_indent() CheckRunVimInTerminal - let buf = RunVimInTerminal('-N Xfile', {'rows': 6, 'cols' : 20}) + let buf = RunVimInTerminal('-N Xarifile', {'rows': 6, 'cols' : 20}) call TermWait(buf) call term_sendkeys(buf, ":set autoindent\n") " leaving insert mode in a new line with indent added by autoindent, should @@ -442,8 +442,8 @@ func Test_autoindent_remove_indent() call term_sendkeys(buf, ":w\n") call TermWait(buf) call StopVimInTerminal(buf) - call assert_equal(["\tfoo", '', repeat('x', 20)], readfile('Xfile')) - call delete('Xfile') + call assert_equal(["\tfoo", '', repeat('x', 20)], readfile('Xarifile')) + call delete('Xarifile') endfunc func Test_edit_CR() @@ -1530,7 +1530,7 @@ func Test_edit_complete_very_long_name() let longfilename = longdirname . '/' . repeat('a', 255) call writefile(['Totum', 'Table'], longfilename) new - exe "next Xfile " . longfilename + exe "next Xnofile " . longfilename exe "normal iT\<C-N>" bwipe! @@ -1754,19 +1754,19 @@ endfunc " Test for editing a file using invalid file encoding func Test_edit_invalid_encoding() CheckEnglish - call writefile([], 'Xfile') + call writefile([], 'Xinvfile') redir => msg - new ++enc=axbyc Xfile + new ++enc=axbyc Xinvfile redir END call assert_match('\[NOT converted\]', msg) - call delete('Xfile') + call delete('Xinvfile') close! endfunc " Test for the "charconvert" option func Test_edit_charconvert() CheckEnglish - call writefile(['one', 'two'], 'Xfile') + call writefile(['one', 'two'], 'Xccfile') " set 'charconvert' to a non-existing function set charconvert=NonExitingFunc() @@ -1774,7 +1774,7 @@ func Test_edit_charconvert() let caught_e117 = v:false try redir => msg - edit ++enc=axbyc Xfile + edit ++enc=axbyc Xccfile catch /E117:/ let caught_e117 = v:true finally @@ -1792,7 +1792,7 @@ func Test_edit_charconvert() set charconvert=Cconv1() new redir => msg - edit ++enc=axbyc Xfile + edit ++enc=axbyc Xccfile redir END call assert_equal(['one', 'two'], getline(1, '$')) call assert_match("can't read output of 'charconvert'", msg) @@ -1807,10 +1807,10 @@ func Test_edit_charconvert() call writefile(data, v:fname_out) endfunc set charconvert=Cconv2() - new Xfile - write ++enc=ucase Xfile1 - call assert_equal(['ONE', 'TWO'], readfile('Xfile1')) - call delete('Xfile1') + new Xccfile + write ++enc=ucase Xccfile1 + call assert_equal(['ONE', 'TWO'], readfile('Xccfile1')) + call delete('Xccfile1') close! delfunc Cconv2 set charconvert& @@ -1821,13 +1821,13 @@ func Test_edit_charconvert() endfunc set charconvert=Cconv3() new - call assert_fails('edit ++enc=lcase Xfile', 'E202:') + call assert_fails('edit ++enc=lcase Xccfile', 'E202:') call assert_equal([''], getline(1, '$')) close! delfunc Cconv3 set charconvert& - call delete('Xfile') + call delete('Xccfile') endfunc " Test for editing a file without read permission @@ -1835,17 +1835,17 @@ func Test_edit_file_no_read_perm() CheckUnix CheckNotRoot - call writefile(['one', 'two'], 'Xfile') - call setfperm('Xfile', '-w-------') + call writefile(['one', 'two'], 'Xnrpfile') + call setfperm('Xnrpfile', '-w-------') new redir => msg - edit Xfile + edit Xnrpfile redir END call assert_equal(1, &readonly) call assert_equal([''], getline(1, '$')) call assert_match('\[Permission Denied\]', msg) close! - call delete('Xfile') + call delete('Xnrpfile') endfunc " Using :edit without leaving 'insertmode' should not cause Insert mode to be diff --git a/src/testdir/test_help_tagjump.vim b/src/testdir/test_help_tagjump.vim index 63042d998..35b0c6869 100644 --- a/src/testdir/test_help_tagjump.vim +++ b/src/testdir/test_help_tagjump.vim @@ -183,14 +183,14 @@ let s:langs = ['en', 'ab', 'ja'] func s:doc_config_setup() let s:helpfile_save = &helpfile - let &helpfile="Xdir1/doc-en/doc/testdoc.txt" + let &helpfile="Xdocdir1/doc-en/doc/testdoc.txt" let s:rtp_save = &rtp - let &rtp="Xdir1/doc-en" + let &rtp="Xdocdir1/doc-en" if has('multi_lang') let s:helplang_save=&helplang endif - call delete('Xdir1', 'rf') + call delete('Xdocdir1', 'rf') for lang in s:langs if lang ==# 'en' @@ -200,7 +200,7 @@ func s:doc_config_setup() let tagfname = 'tags-' . lang let docfname = 'testdoc.' . lang . 'x' endif - let docdir = "Xdir1/doc-" . lang . "/doc" + let docdir = "Xdocdir1/doc-" . lang . "/doc" call mkdir(docdir, "p") call writefile(["\t*test-char*", "\t*test-col*"], docdir . '/' . docfname) call writefile(["test-char\t" . docfname . "\t/*test-char*", @@ -210,7 +210,7 @@ func s:doc_config_setup() endfunc func s:doc_config_teardown() - call delete('Xdir1', 'rf') + call delete('Xdocdir1', 'rf') let &helpfile = s:helpfile_save let &rtp = s:rtp_save @@ -242,7 +242,7 @@ func Test_help_complete() call assert_equal(['test-col', 'test-char'], list) " 'helplang=' and help file lang is 'en' and 'ab' - set rtp+=Xdir1/doc-ab + set rtp+=Xdocdir1/doc-ab set helplang= let list = s:get_help_compl_list("test") call assert_equal(sort(['test-col@en', 'test-col@ab', @@ -255,7 +255,7 @@ func Test_help_complete() \ 'test-char', 'test-char@en']), sort(list)) " 'helplang=' and help file lang is 'en', 'ab' and 'ja' - set rtp+=Xdir1/doc-ja + set rtp+=Xdocdir1/doc-ja set helplang= let list = s:get_help_compl_list("test") call assert_equal(sort(['test-col@en', 'test-col@ab', @@ -298,8 +298,8 @@ func Test_help_respect_current_file_lang() helpclose endfunc - set rtp+=Xdir1/doc-ab - set rtp+=Xdir1/doc-ja + set rtp+=Xdocdir1/doc-ab + set rtp+=Xdocdir1/doc-ja set helplang=ab call s:check_help_file_ext('test-char', 'abx') diff --git a/src/version.c b/src/version.c index d0079d445..bfc669145 100644 --- a/src/version.c +++ b/src/version.c @@ -708,6 +708,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 336, +/**/ 335, /**/ 334, |