https://gcc.gnu.org/g:a407eada0173455d267ba403e9e0fe54f0f5dd51

commit r15-7703-ga407eada0173455d267ba403e9e0fe54f0f5dd51
Author: Iain Buclaw <ibuc...@gdcproject.org>
Date:   Tue Feb 25 20:08:14 2025 +0100

    libphobos: Organize druntime and phobos tests under common directory
    
    The druntime and druntime_shared tests are identical, save for one
    compiled with `-static-libphobos' and the other `-shared-libphobos'.
    Move them to libphobos.druntime/static and libphobos.druntime/shared
    respectively.  This has also been done for libphobos.phobos.
    
    libphobos/ChangeLog:
    
            * testsuite/libphobos.druntime_shared/druntime_shared.exp: Move 
to...
            * testsuite/libphobos.druntime/shared/druntime-shared.exp: ...here.
            * testsuite/libphobos.druntime/druntime.exp: Move to...
            * testsuite/libphobos.druntime/static/druntime-static.exp: ...here.
            * testsuite/libphobos.phobos_shared/phobos_shared.exp: Move to...
            * testsuite/libphobos.phobos/shared/phobos-shared.exp: ...here.
            * testsuite/libphobos.phobos/phobos.exp: Move to...
            * testsuite/libphobos.phobos/static/phobos-static.exp: ...here.

Diff:
---
 .../shared/druntime-shared.exp}                                     | 0
 .../libphobos.druntime/{druntime.exp => static/druntime-static.exp} | 0
 .../phobos_shared.exp => libphobos.phobos/shared/phobos-shared.exp} | 6 +++---
 .../libphobos.phobos/{phobos.exp => static/phobos-static.exp}       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp 
b/libphobos/testsuite/libphobos.druntime/shared/druntime-shared.exp
similarity index 100%
rename from libphobos/testsuite/libphobos.druntime_shared/druntime_shared.exp
rename to libphobos/testsuite/libphobos.druntime/shared/druntime-shared.exp
diff --git a/libphobos/testsuite/libphobos.druntime/druntime.exp 
b/libphobos/testsuite/libphobos.druntime/static/druntime-static.exp
similarity index 100%
rename from libphobos/testsuite/libphobos.druntime/druntime.exp
rename to libphobos/testsuite/libphobos.druntime/static/druntime-static.exp
diff --git a/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp 
b/libphobos/testsuite/libphobos.phobos/shared/phobos-shared.exp
similarity index 89%
rename from libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp
rename to libphobos/testsuite/libphobos.phobos/shared/phobos-shared.exp
index 54acea78a686..31cc13dd9ae2 100644
--- a/libphobos/testsuite/libphobos.phobos_shared/phobos_shared.exp
+++ b/libphobos/testsuite/libphobos.phobos/shared/phobos-shared.exp
@@ -35,10 +35,10 @@ if { [is-effective-target linux_pre_2639] } {
 
 set libphobos_skip_tests {
     # Skip curl tests if library is not available
-    { libphobos.phobos_shared/etc/c/curl.d { ! libcurl_available } }
-    { libphobos.phobos_shared/std/net/curl.d { ! libcurl_available } }
+    { libphobos.phobos/shared/etc/c/curl.d { ! libcurl_available } }
+    { libphobos.phobos/shared/std/net/curl.d { ! libcurl_available } }
     # Skip concurrency.d test: SEGVs or hangs on macOS 13+ (PR d/111628).
-    { libphobos.phobos_shared/std/concurrency.d { x86_64-apple-darwin2[2-9]* } 
}
+    { libphobos.phobos/shared/std/concurrency.d { x86_64-apple-darwin2[2-9]* } 
}
 }
 
 # Initialize dg.
diff --git a/libphobos/testsuite/libphobos.phobos/phobos.exp 
b/libphobos/testsuite/libphobos.phobos/static/phobos-static.exp
similarity index 88%
rename from libphobos/testsuite/libphobos.phobos/phobos.exp
rename to libphobos/testsuite/libphobos.phobos/static/phobos-static.exp
index 3e74078f1366..642019c7f6d7 100644
--- a/libphobos/testsuite/libphobos.phobos/phobos.exp
+++ b/libphobos/testsuite/libphobos.phobos/static/phobos-static.exp
@@ -35,10 +35,10 @@ if { [is-effective-target linux_pre_2639] } {
 
 set libphobos_skip_tests {
     # Skip curl tests if library is not available
-    { libphobos.phobos/etc/c/curl.d { ! libcurl_available } }
-    { libphobos.phobos/std/net/curl.d { ! libcurl_available } }
+    { libphobos.phobos/static/etc/c/curl.d { ! libcurl_available } }
+    { libphobos.phobos/static/std/net/curl.d { ! libcurl_available } }
     # Skip concurrency.d test: SEGVs or hangs on macOS 13+ (PR d/111628).
-    { libphobos.phobos/std/concurrency.d { x86_64-apple-darwin2[2-9]* } }
+    { libphobos.phobos/static/std/concurrency.d { x86_64-apple-darwin2[2-9]* } 
}
 }
 
 # Initialize dg.

Reply via email to