Merge remote-tracking branch 'upstream/master' into example/fix-vanilla_http_server-workflow

Author: enghitalo

.github/workflows/windows_ci.yml

@@ -56,7 +56,7 @@ jobs:
           .\v.exe symlink
           .\v.exe -stats vlib/crypto/ecdsa/ecdsa_test.v
       - name: Test v binaries
-        run: v -silent build-vbinaries
+        run: v build-vbinaries
       - name: All code is formatted
         run: v -silent test-cleancode
       - name: Test new v.c
@@ -86,7 +86,7 @@ jobs:
       - name: Test v->js
         run: v -o hi.js examples/js_hello_world.v && node hi.js
       - name: Build examples
-        run: v -silent build-examples
+        run: v build-examples
       - name: v2 self compilation
         run: v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v
       - name: compile vdoctor.v with -prod
@@ -139,7 +139,7 @@ jobs:
       - name: Test v binaries
         run: v build-vbinaries
       - name: Build examples
-        run: v -silent build-examples
+        run: v build-examples
       - name: v2 self compilation
         run: v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v
 
@@ -193,7 +193,7 @@ jobs:
       - name: Test v binaries
         run: v build-vbinaries
       - name: Build examples
-        run: v -silent build-examples
+        run: v build-examples
       - name: v2 self compilation
         run: v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v && .\v3.exe -o v4.exe cmd/v
 
@@ -233,6 +233,6 @@ jobs:
         # - name: Test v binaries
         #   run: v -silent build-vbinaries
         # - name: Build examples
-        #   run: v -silent build-examples
+        #   run: v build-examples
         # - name: v2 self compilation
         #   run: v -o v2.exe cmd/v && .\v2.exe -o v3.exe cmd/v

cmd/tools/vdoc/document/doc_test.v

@@ -1,4 +1,4 @@
-// import v.ast
+// vtest build: tinyc && !musl? && !sanitized_job?
 import document as doc
 
 // fn test_generate_with_pos() {}

cmd/tools/vpm/dependency_test.v

@@ -1,4 +1,3 @@
-// vtest retry: 3
 import os
 import time
 import rand
@@ -13,13 +12,14 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
-	os.setenv('VMODULES', test_path, true)
-	os.setenv('VPM_DEBUG', '', true)
-	os.setenv('VPM_NO_INCREMENT', '1', true)
+	dump(test_path)
+	test_utils.set_test_env(test_path)
+	os.mkdir_all(test_path) or {}
+	os.chdir(test_path)!
 }
 
 fn testsuite_end() {
+	dump(os.system('find ${test_path}'))
 	os.rmdir_all(test_path) or {}
 }
 
@@ -33,7 +33,6 @@ fn get_mod_name(path string) string {
 
 // Case: running `v install` without specifying modules in a V project directory.
 fn test_install_dependencies_in_module_dir() {
-	os.mkdir_all(test_path) or {}
 	mod := 'my_module'
 	mod_path := os.join_path(test_path, mod)
 	os.mkdir(mod_path)!
@@ -56,9 +55,9 @@ fn test_install_dependencies_in_module_dir() {
 	// Run `v install`
 	mut res := cmd_ok(@LOCATION, '${v} install --once')
 	assert res.output.contains('Detected v.mod file inside the project directory. Using it...'), res.output
-	assert res.output.contains('Installing `markdown`'), res.output
-	assert res.output.contains('Installing `pcre`'), res.output
-	assert res.output.contains('Installing `vtray`'), res.output
+	expect_installing(@LOCATION, res.output, 'markdown')
+	expect_installing(@LOCATION, res.output, 'pcre')
+	expect_installing(@LOCATION, res.output, 'vtray')
 
 	assert get_mod_name(os.join_path(test_path, 'markdown', 'v.mod')) == 'markdown'
 	assert get_mod_name(os.join_path(test_path, 'pcre', 'v.mod')) == 'pcre'
@@ -70,8 +69,8 @@ fn test_install_dependencies_in_module_dir() {
 fn test_resolve_external_dependencies_during_module_install() {
 	res := cmd_ok(@LOCATION, '${v} install -v https://github.com/ttytm/emoji-mart-desktop')
 	assert res.output.contains('Found 2 dependencies'), res.output
-	assert res.output.contains('Installing `webview`'), res.output
-	assert res.output.contains('Installing `miniaudio`'), res.output
+	expect_installing(@LOCATION, res.output, 'webview')
+	expect_installing(@LOCATION, res.output, 'miniaudio')
 	// The external dependencies should have been installed to `<vmodules_dir>/<dependency_name>`
 	assert get_mod_name(os.join_path(test_path, 'webview', 'v.mod')) == 'webview'
 	assert get_mod_name(os.join_path(test_path, 'miniaudio', 'v.mod')) == 'miniaudio'
@@ -91,3 +90,8 @@ fn test_install_with_recursive_dependencies() {
 	cmd_ok(@LOCATION, '${v} remove a b c')
 	cmd_ok(@LOCATION, '${v} install https://gitlab.com/tobealive/a.git')
 }
+
+fn expect_installing(location string, output string, what string) {
+	eprintln('>>> location: ${location}')
+	assert output.contains('Installing `${what}`') || output.contains('Scanning `${what}`'), output
+}

cmd/tools/vpm/install_test.v

@@ -1,3 +1,4 @@
+// vtest build: !musl? && !sanitized_job?
 // vtest retry: 3
 module main
 
@@ -15,7 +16,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 }
 

cmd/tools/vpm/install_version_input_test.v

@@ -1,3 +1,4 @@
+// vtest build: !musl? && !sanitized_job?
 // vtest retry: 3
 import os
 import rand
@@ -17,8 +18,8 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
+	dump(test_path)
 	test_utils.set_test_env(test_path)
-	eprintln('>> test_path: ${test_path}')
 	// Explicitly disable fail on prompt.
 	os.setenv('VPM_FAIL_ON_PROMPT', '', true)
 	os.mkdir_all(test_path) or {}

cmd/tools/vpm/install_version_test.v

@@ -1,3 +1,4 @@
+// vtest build: !musl? && !sanitized_job?
 // vtest retry: 3
 module main
 
@@ -13,6 +14,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 }
 

cmd/tools/vpm/outdated_test.v

@@ -12,11 +12,10 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 	os.mkdir_all(test_path)!
 	os.chdir(test_path)!
-	println('test_path: ${test_path}')
 }
 
 fn testsuite_end() {

cmd/tools/vpm/remove_test.v

@@ -11,6 +11,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 }
 

cmd/tools/vpm/test_utils/utils.v

@@ -5,11 +5,17 @@ import net
 import time
 
 pub fn set_test_env(test_path string) {
+	unbuffer_stdout()
 	os.setenv('VMODULES', test_path, true)
 	os.setenv('VPM_DEBUG', '', true)
 	os.setenv('VPM_NO_INCREMENT', '1', true)
 	os.setenv('VPM_FAIL_ON_PROMPT', '1', true)
-	unbuffer_stdout()
+	// Note: setting a local VTMP here, is *very important*, because VTMP is used for
+	// the destination of the temporary clones done by the child `v install` processes.
+	// If it is not done, then there is a small chance, that multiple parallel tests
+	// can do clones to the same exact folders at the same time, which can make them
+	// fail on the CI, with hard to diagnose spurious errors.
+	os.setenv('VTMP', os.join_path(test_path, 'vtmp'), true)
 }
 
 pub fn hg_serve(hg_path string, path string, start_port int) (&os.Process, int) {

cmd/tools/vpm/update_test.v

@@ -1,3 +1,4 @@
+// vtest build: !musl? && !sanitized_job?
 // vtest retry: 3
 import os
 import rand
@@ -11,7 +12,7 @@ fn testsuite_begin() {
 		eprintln('> skipping ${@FILE}, when `-d network` is missing')
 		exit(0)
 	}
-	unbuffer_stdout()
+	dump(test_path)
 	test_utils.set_test_env(test_path)
 }