From 0ee77d776f6c339113f0a9fe2b9cedf2bee54b11 Mon Sep 17 00:00:00 2001 From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com> Date: Sun, 5 Jan 2014 01:57:19 +0100 Subject: [PATCH] make dotnet tests run for 'test' target --- src/bindings/dotnet/SConscript | 2 +- src/bindings/python/SConscript | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bindings/dotnet/SConscript b/src/bindings/dotnet/SConscript index 739f2d2f..1b95393c 100644 --- a/src/bindings/dotnet/SConscript +++ b/src/bindings/dotnet/SConscript @@ -56,7 +56,7 @@ Depends(dotnettestlib, hammer_dll) Depends(dotnettestlib, libhammer_dotnet) dotnettest = Alias("testdotnet", [dotnettestexec], dotnettestexec) AlwaysBuild(dotnettestexec) -testruns.extend(dotnettestlib) +testruns.append(dotnettestexec) #dotnetinstallexec = dotnetenv.Command(None, libhammer_dotnet, "make install -C " + targetdir) #dotnetinstall = Alias("installdotnet", [dotnetinstallexec], dotnetinstallexec) diff --git a/src/bindings/python/SConscript b/src/bindings/python/SConscript index e7b956fa..dac2d959 100644 --- a/src/bindings/python/SConscript +++ b/src/bindings/python/SConscript @@ -16,7 +16,7 @@ pytests = ['hammer_tests.py'] pytestexec = pytestenv.Command(['hammer.pyc', 'hammer_tests.pyc'], pytests + libhammer_python, "LD_LIBRARY_PATH=" + os.path.dirname(str(libhammer_shared[0])) + " nosetests -vv $SOURCE") pytest = Alias("testpython", [pytestexec], pytestexec) AlwaysBuild(pytestexec) -testruns.extend(pytest) +testruns.append(pytest) pyinstallexec = pythonenv.Command(None, libhammer_python, 'python ' + os.path.join(pydir, 'setup.py ') + ' install') pyinstall = Alias("installpython", [pyinstallexec], pyinstallexec) -- GitLab