From e36f11750b0e4ae12f65ef06ccc2227aaa094ee5 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Wed, 14 Oct 2020 23:58:31 +0300
Subject: [PATCH] v test-fmt: use .skip_files instead of filtering

---
 cmd/tools/vtest-fmt.v | 66 +++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/cmd/tools/vtest-fmt.v b/cmd/tools/vtest-fmt.v
index 811e3d5341..5695afca25 100644
--- a/cmd/tools/vtest-fmt.v
+++ b/cmd/tools/vtest-fmt.v
@@ -5,37 +5,37 @@ import testing
 
 const (
 	known_failing_exceptions = [
-		'./examples/vweb/vweb_example.v',
-		'./cmd/tools/gen_vc.v',
-		'./cmd/tools/modules/vgit/vgit.v', // generics
-		'./cmd/tools/preludes/live_main.v',
-		'./cmd/tools/preludes/live_shared.v',
-		'./cmd/tools/preludes/tests_assertions.v',
-		'./cmd/tools/preludes/tests_with_stats.v',
-		'./cmd/tools/performance_compare.v', // generics
-		'./cmd/tools/oldv.v', // generics
-		'./tutorials/code/blog/article.v',
-		'./tutorials/code/blog/blog.v',
-		'./vlib/arrays/arrays.v',
-		'./vlib/arrays/arrays_test.v',
-		'./vlib/builtin/js/hashmap.v',
-		'./vlib/v/tests/fn_variadic_test.v',
-		'./vlib/v/tests/generic_test.v',
-		'./vlib/crypto/aes/aes.v',
-		'./vlib/crypto/aes/aes_cbc.v',
-		'./vlib/crypto/aes/block_generic.v',
-		'./vlib/crypto/aes/const.v',
-		'./vlib/crypto/aes/cypher_generic.v',
-		'./vlib/crypto/rc4/rc4.v',
-		'./vlib/eventbus/eventbus_test.v',
-		'./vlib/os/bare/bare_example_linux.v',
-		'./vlib/szip/szip.v',
-		'./vlib/uiold/examples/users_gui/users.v',
-		'./vlib/vweb/assets/assets.v',
-		'./vlib/vweb/vweb.v',
-		'./vlib/v/gen/js/tests/life.v',
-		'./vlib/builtin/bare/linuxsys_bare.v',
-		'./vlib/os/os.v',
+		'examples/vweb/vweb_example.v',
+		'cmd/tools/gen_vc.v',
+		'cmd/tools/modules/vgit/vgit.v', // generics
+		'cmd/tools/preludes/live_main.v',
+		'cmd/tools/preludes/live_shared.v',
+		'cmd/tools/preludes/tests_assertions.v',
+		'cmd/tools/preludes/tests_with_stats.v',
+		'cmd/tools/performance_compare.v', // generics
+		'cmd/tools/oldv.v', // generics
+		'tutorials/code/blog/article.v',
+		'tutorials/code/blog/blog.v',
+		'vlib/arrays/arrays.v',
+		'vlib/arrays/arrays_test.v',
+		'vlib/builtin/js/hashmap.v',
+		'vlib/v/tests/fn_variadic_test.v',
+		'vlib/v/tests/generic_test.v',
+		'vlib/crypto/aes/aes.v',
+		'vlib/crypto/aes/aes_cbc.v',
+		'vlib/crypto/aes/block_generic.v',
+		'vlib/crypto/aes/const.v',
+		'vlib/crypto/aes/cypher_generic.v',
+		'vlib/crypto/rc4/rc4.v',
+		'vlib/eventbus/eventbus_test.v',
+		'vlib/os/bare/bare_example_linux.v',
+		'vlib/szip/szip.v',
+		'vlib/uiold/examples/users_gui/users.v',
+		'vlib/vweb/assets/assets.v',
+		'vlib/vweb/vweb.v',
+		'vlib/v/gen/js/tests/life.v',
+		'vlib/builtin/bare/linuxsys_bare.v',
+		'vlib/os/os.v',
 	]
 )
 
@@ -50,6 +50,7 @@ fn v_test_formatting(vargs string) {
 	testing.eheader('Run "v fmt" over all .v files')
 	mut vfmt_test_session := testing.new_test_session('$vargs fmt -worker')
 	vfmt_test_session.files << all_v_files
+	vfmt_test_session.skip_files << known_failing_exceptions
 	vfmt_test_session.test()
 	eprintln(vfmt_test_session.benchmark.total_message('running vfmt over V files'))
 	if vfmt_test_session.benchmark.nfail > 0 {
@@ -62,9 +63,6 @@ fn v_files() []string {
 	mut files_that_can_be_formatted := []string{}
 	all_test_files := os.walk_ext('.', '.v')
 	for tfile in all_test_files {
-		if tfile in known_failing_exceptions {
-			continue
-		}
 		if tfile.starts_with('./vlib/v/cgen/tests') {
 			continue
 		}