Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement of integration test for windows #2917

Merged
merged 2 commits into from
Jun 5, 2024

Conversation

shoo
Copy link
Contributor

@shoo shoo commented Jun 4, 2024

Modified run-unittest.d to run integration tests for Windows.
Also, since OMF was removed in the latest release (2.109.0), the OMF build test was removed.

With this PR, it is likely that run-unittest.sh will become unnecessary, but it has been left in place. This is to ensure that all tests can still be executed as before. As a result, some tests are currently being run twice. If there are no issues after some time, it would be preferable to remove it.

Copy link

github-actions bot commented Jun 4, 2024

✅ PR OK, no changes in deprecations or warnings

Total deprecations: 0

Total warnings: 0

Build statistics:

 statistics (-before, +after)
 executable size=5259464 bin/dub
-rough build time=65s
+rough build time=66s
Full build output
DUB version 1.37.0, built on May 11 2024
LDC - the LLVM D compiler (1.38.0):
  based on DMD v2.108.1 and LLVM 18.1.5
  built with LDC - the LLVM D compiler (1.38.0)
  Default target: x86_64-unknown-linux-gnu
  Host CPU: znver3
  http://dlang.org - http://wiki.dlang.org/LDC


  Registered Targets:
    aarch64     - AArch64 (little endian)
    aarch64_32  - AArch64 (little endian ILP32)
    aarch64_be  - AArch64 (big endian)
    amdgcn      - AMD GCN GPUs
    arm         - ARM
    arm64       - ARM64 (little endian)
    arm64_32    - ARM64 (little endian ILP32)
    armeb       - ARM (big endian)
    avr         - Atmel AVR Microcontroller
    bpf         - BPF (host endian)
    bpfeb       - BPF (big endian)
    bpfel       - BPF (little endian)
    hexagon     - Hexagon
    lanai       - Lanai
    loongarch32 - 32-bit LoongArch
    loongarch64 - 64-bit LoongArch
    mips        - MIPS (32-bit big endian)
    mips64      - MIPS (64-bit big endian)
    mips64el    - MIPS (64-bit little endian)
    mipsel      - MIPS (32-bit little endian)
    msp430      - MSP430 [experimental]
    nvptx       - NVIDIA PTX 32-bit
    nvptx64     - NVIDIA PTX 64-bit
    ppc32       - PowerPC 32
    ppc32le     - PowerPC 32 LE
    ppc64       - PowerPC 64
    ppc64le     - PowerPC 64 LE
    r600        - AMD GPUs HD2XXX-HD6XXX
    riscv32     - 32-bit RISC-V
    riscv64     - 64-bit RISC-V
    sparc       - Sparc
    sparcel     - Sparc LE
    sparcv9     - Sparc V9
    spirv       - SPIR-V Logical
    spirv32     - SPIR-V 32-bit
    spirv64     - SPIR-V 64-bit
    systemz     - SystemZ
    thumb       - Thumb
    thumbeb     - Thumb (big endian)
    ve          - VE
    wasm32      - WebAssembly 32-bit
    wasm64      - WebAssembly 64-bit
    x86         - 32-bit X86: Pentium-Pro and above
    x86-64      - 64-bit X86: EM64T and AMD64
    xcore       - XCore
   Upgrading project in /home/runner/work/dub/dub/
    Starting Performing "release" build using /opt/hostedtoolcache/dc/ldc2-1.38.0/x64/ldc2-1.38.0-linux-x86_64/bin/ldc2 for x86_64.
    Building dub 1.38.0+commit.37.gee787e40: building configuration [application]
     Linking dub
STAT:statistics (-before, +after)
STAT:executable size=5259464 bin/dub
STAT:rough build time=66s

@Geod24
Copy link
Member

Geod24 commented Jun 4, 2024

Regarding the OMF change, we need to merge stable into master, there is a fix for it.
Regarding general direction, I would really like to be able to use the test framework more, so if you feel like trying to convert some tests, it will be welcome! Regardless, removing the .sh is a good goal.

Copy link
Member

@Geod24 Geod24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Just rebase on master and address the comment and we're G2G.

Comment on lines 17 to 19
import std.path : absolutePath, buildPath, baseName, dirName, stripExtension, globMatch;
import std.process : environment, spawnProcess, spawnShell, wait, ProcessConfig = Config;
import std.string: cmp, splitLines;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point I would just get rid of selective imports :)

test/run-unittest.d Show resolved Hide resolved
test/run-unittest.d Show resolved Hide resolved
Comment on lines 111 to 117
bool build;
if (!pack.name.buildPath(".no_build").exists
&& !pack.name.buildPath(".no_build_" ~ dc_bin).exists
&& !pack.name.buildPath(".no_build_" ~ os).exists)
{
//build=1
build = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bool build;
if (!pack.name.buildPath(".no_build").exists
&& !pack.name.buildPath(".no_build_" ~ dc_bin).exists
&& !pack.name.buildPath(".no_build_" ~ os).exists)
{
//build=1
build = true;
bool build =(!pack.name.buildPath(".no_build").exists
&& !pack.name.buildPath(".no_build_" ~ dc_bin).exists
&& !pack.name.buildPath(".no_build_" ~ os).exists);
if (build)
{

Slightly more readable.

@shoo shoo force-pushed the enh_windows_test branch from 78234bf to 68293ef Compare June 5, 2024 14:09
@Geod24 Geod24 merged commit b6939ea into dlang:master Jun 5, 2024
30 of 31 checks passed
@shoo shoo deleted the enh_windows_test branch June 5, 2024 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants