From 3fe0ed04c1ebbf039fe8fc3d59e12905b432de02 Mon Sep 17 00:00:00 2001 From: Shoaib Meenai Date: Tue, 16 Apr 2019 00:18:47 +0000 Subject: [PATCH] Reapply [Support] Add a test for recursive response file expansion Use the appropriate tokenizer to fix the test on Windows. Original commit message: I'm going to be modifying the logic to avoid infinitely recursing on self-referential response files, so add a unit test to verify the expected behavior. Differential Revision: https://reviews.llvm.org/D60630 llvm-svn: 358451 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358465 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Support/CommandLineTest.cpp | 34 +++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/unittests/Support/CommandLineTest.cpp b/unittests/Support/CommandLineTest.cpp index fcbfd33e4c0..263d0e30191 100644 --- a/unittests/Support/CommandLineTest.cpp +++ b/unittests/Support/CommandLineTest.cpp @@ -782,6 +782,40 @@ TEST(CommandLineTest, ResponseFiles) { llvm::sys::fs::remove(TestDir); } +TEST(CommandLineTest, RecursiveResponseFiles) { + SmallString<128> TestDir; + std::error_code EC = sys::fs::createUniqueDirectory("unittest", TestDir); + EXPECT_TRUE(!EC); + + SmallString<128> ResponseFilePath; + sys::path::append(ResponseFilePath, TestDir, "recursive.rsp"); + std::string ResponseFileRef = std::string("@") + ResponseFilePath.c_str(); + + std::ofstream ResponseFile(ResponseFilePath.str()); + EXPECT_TRUE(ResponseFile.is_open()); + ResponseFile << ResponseFileRef << "\n"; + ResponseFile << ResponseFileRef << "\n"; + ResponseFile.close(); + + // Ensure the recursive expansion terminates. + SmallVector Argv = {"test/test", ResponseFileRef.c_str()}; + BumpPtrAllocator A; + StringSaver Saver(A); +#ifdef _WIN32 + cl::TokenizerCallback Tokenizer = cl::TokenizeWindowsCommandLine; +#else + cl::TokenizerCallback Tokenizer = cl::TokenizeGNUCommandLine; +#endif + bool Res = cl::ExpandResponseFiles(Saver, Tokenizer, Argv, false, false); + EXPECT_FALSE(Res); + + // Ensure some expansion took place. + EXPECT_GT(Argv.size(), 2U); + EXPECT_STREQ(Argv[0], "test/test"); + for (size_t i = 1; i < Argv.size(); ++i) + EXPECT_STREQ(Argv[i], ResponseFileRef.c_str()); +} + TEST(CommandLineTest, SetDefautValue) { cl::ResetCommandLineParser(); -- 2.50.1