depend on ament_cmake; specify --build-base and --install-base

Signed-off-by: R Kent James <[email protected]>

Author: rkent

ament_cmake_python_test/package.xml

@@ -12,6 +12,7 @@
   <buildtool_depend>ament_cmake_core</buildtool_depend>
   <build_depend>ament_cmake_pytest</build_depend>
   <build_depend>ament_cmake_python</build_depend>
+  <build_depend>ament_cmake</build_depend>
 
   <test_depend>python3-jinja2</test_depend>
 

ament_cmake_python_test/test/build_with_colcon.py

@@ -15,6 +15,9 @@
 PYTHON_INSTALL_DIR = Path(os.environ.get('PYTHON_INSTALL_DIR'))
 PYEGG_VERSION = os.environ.get('PYEGG_VERSION')
 
+INSTALL_BASE = 'install_test'
+BUILD_BASE = 'build_test'
+
 DEFAULT_OPTIONS = {
   'name': 'SET_ME',
   'version': None,
@@ -146,8 +149,8 @@ def do_build_package(package_name, options=None, base_prefix=SOURCE_DIR / 'test'
   print(f"Building package {package_name} with colcon options: {build_options}")
   build_command = ['colcon', 'build',
     '--base-paths', base_prefix / 'packages' / package_name,
-    '--build-base', 'build_test',
-    '--install-base', 'install_test']
+    '--build-base', BUILD_BASE,
+    '--install-base', INSTALL_BASE]
   if build_options:
     build_command.append(build_options)
   result = subprocess.run(build_command, capture_output=True, text=True)
@@ -160,9 +163,9 @@ def do_test_package(package_name, options):
   print(f"Testing package {package_name} PWD tree:")
   list_files(str(PWD))
   if options['destination']:
-    install_path = PWD / 'install' / package_name / options['destination'] / package_name
+    install_path = PWD / INSTALL_BASE / package_name / options['destination'] / package_name
   else:
-    install_path = PWD / 'install' / package_name / PYTHON_INSTALL_DIR / package_name
+    install_path = PWD / INSTALL_BASE / package_name / PYTHON_INSTALL_DIR / package_name
   print(f"install_path for package {package_name}: {install_path}")
   assert install_path.exists(), f"install path does not exist for {package_name}: {install_path}"
   assert (install_path / '__init__.py').exists(), f"missing __init__.py in {install_path}"
@@ -181,7 +184,7 @@ def do_test_package(package_name, options):
   if options['version']:
       print(f"Testing version: {options['version']} IN EGG-INFO in package {package_name}")
       version = options['version']
-      egg_info_dir = PWD / 'install' / package_name / PYTHON_INSTALL_DIR / f'{package_name}-{version}-{PYEGG_VERSION}.egg-info'
+      egg_info_dir = PWD / INSTALL_BASE / package_name / PYTHON_INSTALL_DIR / f'{package_name}-{version}-{PYEGG_VERSION}.egg-info'
       assert egg_info_dir.exists(), f"egg-info dir does not exist for {package_name}: {egg_info_dir}"
       egg_info_file = egg_info_dir / 'PKG-INFO'
       assert Path.read_text(egg_info_file).find(f"Version: {version}") != -1, \
@@ -199,7 +202,7 @@ def do_test_package(package_name, options):
 
   if options['scripts_destination']:
       print(f"Testing script installed in package {package_name}")
-      script_path = PWD / 'install' / package_name / options['scripts_destination'] / 'do_something'
+      script_path = PWD / INSTALL_BASE / package_name / options['scripts_destination'] / 'do_something'
       assert script_path.exists(), f"script do_something does not exist for {package_name}: {script_path}"
 
   # If we got this far, the test passed, but we want to see output.