diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-27 01:43:34 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-04-27 02:47:27 +0200 |
| commit | 873b5de87c3186d85bb497b0f9c13b8c5e425712 (patch) | |
| tree | 4300977805be65898942d64914b121533ef97001 /gcc | |
| parent | 2370bdbb0b29b14401d8508d846c0e01c64d82fc (diff) | |
| download | gcc-873b5de87c3186d85bb497b0f9c13b8c5e425712.zip gcc-873b5de87c3186d85bb497b0f9c13b8c5e425712.tar.gz gcc-873b5de87c3186d85bb497b0f9c13b8c5e425712.tar.bz2 | |
d: Merge upstream dmd f8a1a5153, druntime 2b5c0b27
Adds a new test directive COMPILABLE_MATH_TEST, and support has been
added for it in gdc-convert-test so that they are skipped if phobos is
not present on the target.
Only change in D runtime is a small documentation fix.
Reviewed-on: https://github.com/dlang/druntime/pull/3067
https://github.com/dlang/dmd/pull/11060
gcc/testsuite/ChangeLog:
PR d/89418
* lib/gdc-utils.exp (gdc-convert-test): Add dg-skip-if for compilable
tests that depend on the phobos standard library.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gdc.test/compilable/ctfe_math.d | 1 | ||||
| -rw-r--r-- | gcc/testsuite/gdc.test/compilable/test5227.d | 1 | ||||
| -rw-r--r-- | gcc/testsuite/lib/gdc-utils.exp | 9 |
5 files changed, 18 insertions, 1 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index a878cb9..f933cf1 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -09db0c41ee922502fa0966bde24c1cb9b15ad436 +f8a1a515346b16ebbd9da56a908540cbef1ee582 The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1f412a0..d6529ea 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2020-04-27 Iain Buclaw <ibuclaw@gdcproject.org> + PR d/89418 + * lib/gdc-utils.exp (gdc-convert-test): Add dg-skip-if for compilable + tests that depend on the phobos standard library. + +2020-04-27 Iain Buclaw <ibuclaw@gdcproject.org> + PR d/94777 * gdc.dg/pr94777a.d: New test. * gdc.dg/pr94777b.d: New test. diff --git a/gcc/testsuite/gdc.test/compilable/ctfe_math.d b/gcc/testsuite/gdc.test/compilable/ctfe_math.d index 78de869..334b75a 100644 --- a/gcc/testsuite/gdc.test/compilable/ctfe_math.d +++ b/gcc/testsuite/gdc.test/compilable/ctfe_math.d @@ -1,3 +1,4 @@ +// COMPILABLE_MATH_TEST // Test CTFE builtins for std.math functions. import std.math; diff --git a/gcc/testsuite/gdc.test/compilable/test5227.d b/gcc/testsuite/gdc.test/compilable/test5227.d index c270b79..63ca752 100644 --- a/gcc/testsuite/gdc.test/compilable/test5227.d +++ b/gcc/testsuite/gdc.test/compilable/test5227.d @@ -1,4 +1,5 @@ /* +COMPILABLE_MATH_TEST REQUIRED_ARGS: PERMUTE_ARGS: TEST_OUTPUT: diff --git a/gcc/testsuite/lib/gdc-utils.exp b/gcc/testsuite/lib/gdc-utils.exp index 87d1105..5c17346 100644 --- a/gcc/testsuite/lib/gdc-utils.exp +++ b/gcc/testsuite/lib/gdc-utils.exp @@ -302,6 +302,12 @@ proc gdc-convert-test { base test } { # It will need skipping if phobos is not available on the target. regsub -- {RUNNABLE_PHOBOS_TEST.*$} $copy_line "" out_line set needs_phobos 1 + + } elseif [regexp -- {COMPILABLE_MATH_TEST} $copy_line match sources] { + # COMPILABLE_MATH_TEST annotates tests that import the std.math + # module. Which will need skipping if not available on the target. + regsub -- {RUNNABLE_PHOBOS_TEST.*$} $copy_line "" out_line + set needs_phobos 1 } puts $fdout $out_line @@ -358,6 +364,9 @@ proc gdc-convert-test { base test } { # Cleanup extra generated files. puts $fdout "// { dg-final { file delete $genfile } }" } + if $needs_phobos { + puts $fdout "// { dg-skip-if \"imports phobos\" { ! d_runtime_has_std_library } }" + } } fail_compilation { |