Update the tests for VS 16.4.

stevencpp · stevencpp · commit 50297901bcfa · 2019-12-19T01:17:37.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -257,6 +257,7 @@ jobs:
         fi
         
     - name: install package
+      # creating the package can take a while so do this only when we've pushed some tags for a release
       if: startsWith(github.ref, 'refs/tags/')
       shell: bash
       run: |
diff --git a/README.md b/README.md
@@ -52,29 +52,28 @@ target_cpp_header_units(test B.h)
 how to build it (after installing the cpp_modules CMake extension):
 * with ninja / clang-9 on Ubuntu
 ```bash
-export CXX=clang++-9; export CC=clang-9;
-export CXXFLAGS="-stdlib=libc++"; export LDFLAGS="-stdlib=libc++ -fuse-ld=lld";
+export CXX=clang++-9;
 mkdir build && cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../
+cmake -G Ninja ..
 cmake --build .
 ```
 * with ninja / msvc (in a Developer Command Prompt or after running vcvarsall.bat)
 ``` bash
 mkdir build && cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug ../
+cmake -G Ninja ..
 cmake --build .
 ```
 * with msbuild / msvc (in a Developer Command Prompt or after running vcvarsall.bat)
 ```bash
 mkdir build && cd build
-cmake -G "Visual Studio 16 2019" -A "X64" ../
+cmake -G "Visual Studio 16 2019" -A "X64" ..
 cmake --build . --parallel --config Debug
 ```
 * with ninja / clang-cl (in a Developer Command Prompt or after running vcvarsall.bat)
 ```bash
 mkdir build && cd build
 set PATH=%PATH%;C:\Program Files\LLVM\bin
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang-cl.exe ../
+cmake -G Ninja -DCMAKE_CXX_COMPILER=clang-cl.exe ..
 cmake --build .
 ```
 See `/tests/` for examples with more modules, header units, generated headers/sources.
diff --git a/src/scanner/scanner.cpp b/src/scanner/scanner.cpp
@@ -962,15 +962,14 @@ struct ScannerImpl {
 			// todo: currently, if the scan fails then we don't update the item
 			// so it never gets saved in failed state
 			// and so if it's up to date then it must've succeeded last time
-			// but maybe we should should save the errors ?
+			// but maybe we should save the errors ?
 			bool success = (item_ood[idx] == ood_state::up_to_date || got_result[idx]);
 			ret.push_back({ item_ood[idx],
 				success ? scan_state::success : scan_state::failed });
 		}
 		return ret;
 	}
 
-	// note: all of the input paths are required to be normalized already
 	auto scan(Scanner::Type tool_type, std::string_view tool_path,
 		std::string_view db_path, std::string_view int_dir, std::string_view item_root_path,
 		bool commands_contain_item_path, span_map<cmd_idx_t, std::string_view> commands,
@@ -1123,7 +1122,7 @@ vector_map<scan_item_idx_t, Scanner::Result> Scanner::scan(const ConfigView & cc
 			throw std::invalid_argument(fmt::format("target_idx {} for {} is out of range [0..{}-1]",
 				(uint32_t)item.target_idx, item.path, (uint32_t)c.item_set.targets.size()));
 		if (item.command_idx >= c.item_set.commands.size())
-			throw std::invalid_argument(fmt::format("target_idx {} for {} is out of range [0..{}-1]",
+			throw std::invalid_argument(fmt::format("command_idx {} for {} is out of range [0..{}-1]",
 				(uint32_t)item.command_idx, item.path, (uint32_t)c.item_set.commands.size()));
 	}
 
diff --git a/src/test/gen_ninja.cpp b/src/test/gen_ninja.cpp
@@ -123,7 +123,6 @@ TEST_CASE("ninja generator system test", "[ninja]") {
 
 	for (std::string& test : get_run_set("", ninja_run_set)) {
 		full_clean_one(test);
-		bool verbose_scan = false;
 		run_one(test, { .generator = "Ninja", .compiler = compiler });
 		run_one(test, { .generator = "Ninja", .compiler = compiler,
 			.expect_no_work_to_do = true, .expect_out_of_date = false });
diff --git a/tests/dag/B3.cpp b/tests/dag/B3.cpp
@@ -1,15 +1,7 @@
-#ifdef __clang__
 module;
 #include <D5.hpp>
-#endif
 export module B3;
 
-#ifndef __clang__
-extern "C++" {
-#include <D5.hpp>
-}
-#endif
-
 import std.core;
 
 import B2;
