summaryrefslogtreecommitdiff
path: root/test/toolpath
diff options
context:
space:
mode:
authorgrbd <garlicbready@googlemail.com>2017-08-03 15:53:20 +0100
committergrbd <garlicbready@googlemail.com>2017-08-03 15:53:20 +0100
commitd8411e0cf81535f8396db5c07b73f40b28a197c6 (patch)
treed149ae7ee604fbb9200b06ca96ebe49bfdb5e0f3 /test/toolpath
parent5a74ea2d38aa36dfaad6bad5b257277d07146d9f (diff)
downloadscons-d8411e0cf81535f8396db5c07b73f40b28a197c6.tar.gz
Added support for a PyPackageDir function
Diffstat (limited to 'test/toolpath')
-rw-r--r--test/toolpath/nested/image/SConstruct7
-rw-r--r--test/toolpath/nested/nested.py3
2 files changed, 10 insertions, 0 deletions
diff --git a/test/toolpath/nested/image/SConstruct b/test/toolpath/nested/image/SConstruct
index 211a0d73..78ae21d9 100644
--- a/test/toolpath/nested/image/SConstruct
+++ b/test/toolpath/nested/image/SConstruct
@@ -55,4 +55,11 @@ print("env3['Toolpath_TestTool1_2'] =", env3.get('Toolpath_TestTool1_2'))
print("env3['Toolpath_TestTool2_1'] =", env3.get('Toolpath_TestTool2_1'))
print("env3['Toolpath_TestTool2_2'] =", env3.get('Toolpath_TestTool2_2'))
+
+print('Test using PyPackageDir')
+toollist = ['Toolpath_TestTool2_1', 'Toolpath_TestTool2_2']
+env4 = Environment(tools = toollist, toolpath = [PyPackageDir('tools_example.subdir1.subdir2')])
+print("env4['Toolpath_TestTool2_1'] =", env4.get('Toolpath_TestTool2_1'))
+print("env4['Toolpath_TestTool2_2'] =", env4.get('Toolpath_TestTool2_2'))
+
sys.path = oldsyspath
diff --git a/test/toolpath/nested/nested.py b/test/toolpath/nested/nested.py
index a736d587..df2ba073 100644
--- a/test/toolpath/nested/nested.py
+++ b/test/toolpath/nested/nested.py
@@ -57,6 +57,9 @@ env3['Toolpath_TestTool1_1'] = 1
env3['Toolpath_TestTool1_2'] = 1
env3['Toolpath_TestTool2_1'] = 1
env3['Toolpath_TestTool2_2'] = 1
+Test using PyPackageDir
+env4['Toolpath_TestTool2_1'] = 1
+env4['Toolpath_TestTool2_2'] = 1
scons: done reading SConscript files.
scons: Building targets ...
scons: `.' is up to date.