[lldb][tests][NFC] Move C++ gmodules tests into new gmodules/ subdirectory

[Michael137]

Summary

This is in preparation for adding more gmodules
tests.

[dyung]

@Michael137, your change is causing cmake to fail on one of our bots:

https://lab.llvm.org/buildbot/#/builders/217/builds/11819

CMake Error at cmake/modules/AddLLVM.cmake:1867 (add_custom_target):
  add_custom_target cannot create target
  "check-lldb-api-lang-cpp-gmodules-templates" because another target with
  the same name already exists.  The existing target is a custom target
  created in source directory
  "/home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API".
  See documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  cmake/modules/AddLLVM.cmake:1980 (add_lit_target)
  /home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API/CMakeLists.txt:4 (add_lit_testsuites)

Can you take a look?

[Michael137]

In D133876#3796847, @dyung wrote:

@Michael137, your change is causing cmake to fail on one of our bots:

https://lab.llvm.org/buildbot/#/builders/217/builds/11819

CMake Error at cmake/modules/AddLLVM.cmake:1867 (add_custom_target):
  add_custom_target cannot create target
  "check-lldb-api-lang-cpp-gmodules-templates" because another target with
  the same name already exists.  The existing target is a custom target
  created in source directory
  "/home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API".
  See documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  cmake/modules/AddLLVM.cmake:1980 (add_lit_target)
  /home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API/CMakeLists.txt:4 (add_lit_testsuites)

Can you take a look?

Here I'm just renaming a directory. @dyung I think this might have to do with a stale __pycache__ directory in the test directory. Can you force a fresh checkout on the build bot and restart?

[jingham]

To be more specific, the problem is that there used to be a directory in the test suite called gmodules-template and Michael moved it to gmodules/template to better organize the tests. But our rule for making a test name from subdirectories is to replace the "/" with a "-" so these two ended up being the same test name, which is an error.

Michael's patch properly moved gmodules-template to gmodules/template so there actually shouldn't be a conflict. But because python insists on sticking these pycache directories alongside the test files git won't actually remove the directory on update, and thus until you either manually remove the gmodules-template directory or do a fresh checkout you'll get this error.

Is there a way to get the testsuite runs not to put these cache files into the source tree? Running the testsuite really shouldn't be changing the source tree... Or if we can't get it to stop that, is there a "git pull" that will clean up anything not actually in the repo? I don't think we ever actually want to preserve anything of that sort from run to run.

Jim

[dyung]

In D133876#3796923, @Michael137 wrote:

In D133876#3796847, @dyung wrote:

@Michael137, your change is causing cmake to fail on one of our bots:

https://lab.llvm.org/buildbot/#/builders/217/builds/11819

CMake Error at cmake/modules/AddLLVM.cmake:1867 (add_custom_target):
  add_custom_target cannot create target
  "check-lldb-api-lang-cpp-gmodules-templates" because another target with
  the same name already exists.  The existing target is a custom target
  created in source directory
  "/home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API".
  See documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  cmake/modules/AddLLVM.cmake:1980 (add_lit_target)
  /home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API/CMakeLists.txt:4 (add_lit_testsuites)

Can you take a look?

Here I'm just renaming a directory. @dyung I think this might have to do with a stale __pycache__ directory in the test directory. Can you force a fresh checkout on the build bot and restart?

I only found one pycache directory and deleting it didn't seem to make a difference. Any other suggestions?

[Michael137]

In D133876#3797098, @dyung wrote:

In D133876#3796923, @Michael137 wrote:

In D133876#3796847, @dyung wrote:

@Michael137, your change is causing cmake to fail on one of our bots:

https://lab.llvm.org/buildbot/#/builders/217/builds/11819

CMake Error at cmake/modules/AddLLVM.cmake:1867 (add_custom_target):
  add_custom_target cannot create target
  "check-lldb-api-lang-cpp-gmodules-templates" because another target with
  the same name already exists.  The existing target is a custom target
  created in source directory
  "/home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API".
  See documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  cmake/modules/AddLLVM.cmake:1980 (add_lit_target)
  /home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API/CMakeLists.txt:4 (add_lit_testsuites)

Can you take a look?

Here I'm just renaming a directory. @dyung I think this might have to do with a stale __pycache__ directory in the test directory. Can you force a fresh checkout on the build bot and restart?

I only found one pycache directory and deleting it didn't seem to make a difference. Any other suggestions?

Could you try deleting the lldb/test/API/lang/cpp/gmodules-templates directory?

[dyung]

In D133876#3797145, @Michael137 wrote:

In D133876#3797098, @dyung wrote:

In D133876#3796923, @Michael137 wrote:

In D133876#3796847, @dyung wrote:

@Michael137, your change is causing cmake to fail on one of our bots:

https://lab.llvm.org/buildbot/#/builders/217/builds/11819

CMake Error at cmake/modules/AddLLVM.cmake:1867 (add_custom_target):
  add_custom_target cannot create target
  "check-lldb-api-lang-cpp-gmodules-templates" because another target with
  the same name already exists.  The existing target is a custom target
  created in source directory
  "/home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API".
  See documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  cmake/modules/AddLLVM.cmake:1980 (add_lit_target)
  /home/buildbot/buildbot-root/cross-project-tests-sie-ubuntu/llvm-project/lldb/test/API/CMakeLists.txt:4 (add_lit_testsuites)

Can you take a look?

Here I'm just renaming a directory. @dyung I think this might have to do with a stale __pycache__ directory in the test directory. Can you force a fresh checkout on the build bot and restart?

I only found one pycache directory and deleting it didn't seem to make a difference. Any other suggestions?

Could you try deleting the lldb/test/API/lang/cpp/gmodules-templates directory?

That seemed to do the trick, thanks!

lldb/test/API/lang/cpp/gmodules/basic/Makefile

 PCH_CXX_SOURCE = pch.h
 CXX_SOURCES = main.cpp
 CFLAGS_EXTRAS := $(MODULE_DEBUG_INFO_FLAGS)
 
 include Makefile.rules

lldb/test/API/lang/cpp/gmodules/basic/TestWithModuleDebugging.py

 import lldb
 import os
 from lldbsuite.test.decorators import *
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test import lldbutil
 
 
 class TestWithGmodulesDebugInfo(TestBase):
 
     @skipIf(bugnumber="llvm.org/pr36146", oslist=["linux"], archs=["i386"])
     @add_test_categories(["gmodules"])
     def test_specialized_typedef_from_pch(self):
         self.build()
 
         src_file = os.path.join(self.getSourceDir(), "main.cpp")
         src_file_spec = lldb.SBFileSpec(src_file)
         self.assertTrue(src_file_spec.IsValid(), "breakpoint file")
 
         # Get the path of the executable
         exe_path = self.getBuildArtifact("a.out")
 
         # Load the executable
         target = self.dbg.CreateTarget(exe_path)
         self.assertTrue(target.IsValid(), VALID_TARGET)
 
         # Break on interesting line
         breakpoint = target.BreakpointCreateBySourceRegex(
             "break here", src_file_spec)
         self.assertTrue(
             breakpoint.IsValid() and breakpoint.GetNumLocations() >= 1,
             VALID_BREAKPOINT)
 
         # Launch the process
         process = target.LaunchSimple(
             None, None, self.get_process_working_directory())
         self.assertTrue(process.IsValid(), PROCESS_IS_VALID)
 
         # Get the thread of the process
         self.assertState(process.GetState(), lldb.eStateStopped)
         thread = lldbutil.get_stopped_thread(
             process, lldb.eStopReasonBreakpoint)
         self.assertTrue(
             thread.IsValid(),
             "There should be a thread stopped due to breakpoint condition")
 
         # Get frame for current thread
         frame = thread.frames[0]
 
         testValue = frame.EvaluateExpression("test")
         self.assertTrue(
             testValue.GetError().Success(),
             "Test expression value invalid: %s" %
             (testValue.GetError().GetCString()))
         self.assertEqual(
             testValue.GetTypeName(), "IntContainer",
             "Test expression type incorrect")
 
         memberValue = testValue.GetChildMemberWithName("storage")
         self.assertTrue(
             memberValue.GetError().Success(),
             "Member value missing or invalid: %s" %
             (testValue.GetError().GetCString()))
         self.assertEqual(
             memberValue.GetTypeName(), "int",
             "Member type incorrect")
         self.assertEqual(
             42,
             memberValue.GetValueAsSigned(),
             "Member value incorrect")
 
         testValue = frame.EvaluateExpression("bar")
         self.assertTrue(
             testValue.GetError().Success(),
             "Test expression value invalid: %s" %
             (testValue.GetError().GetCString()))
         self.assertEqual(
             testValue.GetTypeName(), "Foo::Bar",
             "Test expression type incorrect")
 
         memberValue = testValue.GetChildMemberWithName("i")
         self.assertTrue(
             memberValue.GetError().Success(),
             "Member value missing or invalid: %s" %
             (testValue.GetError().GetCString()))
         self.assertEqual(
             memberValue.GetTypeName(), "int",
             "Member type incorrect")
         self.assertEqual(
             123,
             memberValue.GetValueAsSigned(),
             "Member value incorrect")
 

lldb/test/API/lang/cpp/gmodules/basic/main.cpp

 class Foo::Bar { int i = 123; };
 
 int main(int argc, const char * argv[])
 {
     IntContainer test(42);
     Foo::Bar bar;
     return 0; // break here
 }

lldb/test/API/lang/cpp/gmodules/basic/pch.h

 template<typename T>
 class GenericContainer {
   private:
     T storage;
 
   public:
     GenericContainer(T value) {
       storage = value;
     };
 };
 
 typedef GenericContainer<int> IntContainer;
 
 struct Foo {
   class Bar;
   Bar *bar;
 };

lldb/test/API/lang/cpp/gmodules/templates/TestGModules.py

 import lldbsuite.test.lldbinline as lldbinline
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(), [
     expectedFailureAll(oslist=["linux"], bugnumber="llvm.org/pr36107",
         debug_info="gmodules")])

lldb/test/API/lang/cpp/gmodules/templates/a.h

 #include "memory.h"
 
 class MemoryBuffer { int buffer = 42; };
 
 struct SrcBuffer {
   my_std::unique_ptr<MemoryBuffer> Buffer;
 };

lldb/test/API/lang/cpp/gmodules/templates/b.h

 #include "a.h"
 #include "memory.h"
 
 class Module {
   my_std::unique_ptr<MemoryBuffer> MBptr;
 };

lldb/test/API/lang/cpp/gmodules/templates/main.cpp

 #include "b.h"
 
 int main(int argc, const char * argv[])
 {
     Module m;
     // Test that the type Module which contains a field that is a
     // template instantiation can be fully resolved.
     return 0; //% self.assertTrue(self.frame().FindVariable('m').GetChildAtIndex(0).GetChildAtIndex(0).GetChildAtIndex(0).GetName() == 'buffer', 'find template specializations in imported modules')
 }

lldb/test/API/lang/cpp/gmodules/templates/memory.h

 #ifndef MEMORY_H
 #define MEMORY_H
 namespace my_std {
   template<class T> class unique_ptr {
     T t;
   };
 }
 #endif

lldb/test/API/lang/cpp/gmodules/templates/module.modulemap

 module A {
   header "a.h"
 }
 
 module B {
   header "b.h"
 }
 
 module std {
   header "memory.h"
 }