wip

Author: jrosdahl

src/ccache/argprocessing.cpp

@@ -386,6 +386,7 @@ process_option_arg(const Context& ctx,
                    size_t& args_index,
                    ArgumentProcessingState& state)
 {
+  PRINT(stderr, "XXX: process_option_arg {}\n", args[args_index]);
   size_t& i = args_index;
 
   if (option_should_be_ignored(args[i], ctx.ignore_options())) {
@@ -438,6 +439,9 @@ process_option_arg(const Context& ctx,
     if (argpath[-1] == '-') {
       ++argpath;
     }
+    PRINT(stderr,
+          "XXX:   config.response_file_format() = {}\n",
+          int(config.response_file_format()));
     auto file_args =
       util::Args::from_response_file(argpath, config.response_file_format());
     if (!file_args) {
@@ -642,6 +646,7 @@ process_option_arg(const Context& ctx,
     if (arg.length() > 3 && arg.starts_with("-T")
         && (arg[2] == 'c' || arg[2] == 'p')) {
       args_info.input_file_prefix = arg.substr(0, 3);
+      PRINT(stderr, "XXX: input file {}\n", arg.substr(3));
       state.input_files.emplace_back(arg.substr(3));
       return Statistic::none;
     }
@@ -1412,6 +1417,10 @@ process_arg(const Context& ctx,
     process_option_arg(ctx, args_info, config, args, args_index, state);
 
   if (statistic && *statistic != Statistic::none) {
+    PRINT(stderr,
+          "XXX: returning error {} for {}\n",
+          int(*statistic),
+          args[args_index]);
     return *statistic; // error found
   }
 
@@ -1420,9 +1429,14 @@ process_arg(const Context& ctx,
     LOG("Creating PCH with MSVC, disabling base directory");
     config.set_base_dirs({});
     restart = true;
+    PRINT(stderr, "XXX: found /Yc, restarting\n");
   }
 
   if (statistic) {
+    PRINT(stderr,
+          "XXX: returning non-error {} for {}\n",
+          int(*statistic),
+          args[args_index]);
     return *statistic; // processed option without error
   }
 
@@ -1435,6 +1449,9 @@ process_arg(const Context& ctx,
   // file when code is testing compiler flags.
   if (!util::is_dev_null_path(args[i])) {
     if (!DirEntry(args[i]).is_regular_file()) {
+      PRINT(stderr,
+            "XXX: {} is not a regular file, not considering as input file\n",
+            args[i]);
       LOG("{} is not a regular file, not considering as input file", args[i]);
       state.add_common_arg(args[i]);
       return Statistic::none;
@@ -1443,8 +1460,10 @@ process_arg(const Context& ctx,
 
   if (fs::exists(args[i])) {
     LOG("Detected input file: {}", args[i]);
+    PRINT(stderr, "XXX: input file {}\n", args[i]);
     state.input_files.emplace_back(args[i]);
   } else {
+    PRINT(stderr, "XXX: input file {} does not exist\n", args[i]);
     LOG("Not considering {} an input file since it doesn't exist", args[i]);
     state.add_common_arg(args[i]);
   }
@@ -1515,6 +1534,7 @@ process_args(Context& ctx)
 
   if (state.input_files.empty()) {
     LOG("No input file found");
+    PRINT(stderr, "XXX: state.input_files.empty()\n");
     return tl::unexpected(Statistic::no_input_file);
   }
   if (state.input_files.size() > 1) {

unittest/test_argprocessing.cpp

@@ -786,15 +786,21 @@ TEST_CASE("MSVC /Yc in response file disables base_dir rewriting")
                                source_path)));
 
   ctx.orig_args = Args::from_string("cl.exe @pch.rsp");
+  PRINT(stderr, "XXX: RUNNING /Yc TEST: process_args\n");
   const auto result = process_args(ctx);
+  PRINT(stderr, "XXX: RUNNING /Yc TEST: process_args done\n");
 
+  if (!result) {
+    FAIL("XXX: error: ", result.error());
+  }
   REQUIRE(result);
   CHECK(ctx.args_info.generating_pch);
   CHECK(ctx.args_info.output_obj == output_path);
   CHECK(result->preprocessor_args.to_string()
         == FMT("cl.exe /Yc -Fp{} -FI{}", pch_path, include_path));
 }
 
+#if 0 // XXX
 TEST_CASE("MSVC /Yc with base_dir preserves later argument errors")
 {
   TestContext test_context;
@@ -1120,4 +1126,6 @@ TEST_CASE("-Xarch_device with -Xarch_x86_64 is too hard")
   CHECK(result.error() == Statistic::unsupported_compiler_option);
 }
 
+#endif
+
 TEST_SUITE_END();