aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael <michaelbrockus@gmail.com>2020-03-02 08:46:35 -0800
committerJussi Pakkanen <jpakkane@gmail.com>2020-03-08 13:51:03 +0200
commit5df106592c353bf3adc800287d02066b3ea07542 (patch)
treedc1a8d9a8c875253517e079c8c847033601b13ad
parent4ce90bcb08c52c4f2385ecf36db898225fafd140 (diff)
downloadmeson-5df106592c353bf3adc800287d02066b3ea07542.zip
meson-5df106592c353bf3adc800287d02066b3ea07542.tar.gz
meson-5df106592c353bf3adc800287d02066b3ea07542.tar.bz2
update test_templates to add dlang and find rust
-rwxr-xr-xrun_unittests.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 12ec270..4ab2d75 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -3309,6 +3309,12 @@ int main(int argc, char **argv) {
except EnvironmentException:
pass
# FIXME: omitting rust as Windows AppVeyor CI finds Rust but doesn't link correctly
+ if not is_windows():
+ try:
+ env.detect_rust_compiler(MachineChoice.HOST)
+ langs.append('rust')
+ except EnvironmentException:
+ pass
for lang in langs:
for target_type in ('executable', 'library'):
@@ -3321,7 +3327,7 @@ int main(int argc, char **argv) {
self._run(ninja,
workdir=os.path.join(tmpdir, 'builddir'))
# test directory with existing code file
- if lang in ('c', 'cpp'):
+ if lang in ('c', 'cpp', 'd'):
with tempfile.TemporaryDirectory() as tmpdir:
with open(os.path.join(tmpdir, 'foo.' + lang), 'w') as f:
f.write('int main(void) {}')