[PATCH v7 0/3] MR474: Draft: Test running the shader runner on the correct test data on Windows.

[Giovanni Mascellani (＠giomasce)]

So far this MR is just for experimentation, do not review it.

--
  v7: Test.
 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/474

[PATCH v7 1/3] First.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/474

[PATCH v7 2/3] Second.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/474

[PATCH v7 3/3] Test.

[Giovanni Mascellani]

From: Giovanni Mascellani <gmascellani(a)codeweavers.com>

---
 gitlab/build.yml | 143 -----------------------------------------------
 gitlab/test.yml  |  21 +------
 tests/driver.c   |  35 ++++--------
 3 files changed, 14 insertions(+), 185 deletions(-)

diff --git a/gitlab/build.yml b/gitlab/build.yml
index 9695a3042..ed16202d2 100644
--- a/gitlab/build.yml
+++ b/gitlab/build.yml
@@ -1,66 +1,3 @@
-.build-linux:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  image: $CI_REGISTRY/wine/vkd3d:debian-bookworm
-  interruptible: true
-  needs:
-    - job: build-image
-      optional: true
-  dependencies: []
-  script:
-    - git config --global --add safe.directory $CI_PROJECT_DIR
-    - git clean -fdx
-    - git reset --hard
-    - rm -fr .git/rebase-merge
-    - mkdir artifacts
-    - cat /proc/cpuinfo > artifacts/cpuinfo.txt
-    - cat /proc/meminfo > artifacts/meminfo.txt
-    - vulkaninfo > artifacts/vulkaninfo.txt
-    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-linux
-    - if [ -f build_failed ] ; then exit 1 ; fi
-    - if [ -f tests_failed ] ; then exit 2 ; fi
-  artifacts:
-    when: always
-    paths:
-      - artifacts
-
-build-radv-64:
-  extends: .build-linux
-  tags:
-    - amd-gpu
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'radeon_*'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
-build-llvmpipe-64:
-  extends: .build-linux
-  allow_failure:
-    exit_codes:
-      - 2
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'lvp_*'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
-build-radv-32:
-  extends: .build-linux
-  tags:
-    - amd-gpu
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'radeon_*'
-    CC: 'gcc -m32'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
-build-llvmpipe-32:
-  extends: .build-linux
-  allow_failure:
-    exit_codes:
-      - 2
-  variables:
-    VK_LOADER_DRIVERS_SELECT: 'lvp_*'
-    CC: 'gcc -m32'
-    VKD3D_SHADER_CONFIG: 'force_validation'
-
 build-crosstest:
   stage: build
   rules:
@@ -86,83 +23,3 @@ build-crosstest:
     when: always
     paths:
       - artifacts
-
-.build-mingw:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  image: $CI_REGISTRY/wine/vkd3d:debian-bookworm
-  interruptible: true
-  needs:
-    - job: build-image
-      optional: true
-  dependencies: []
-  script:
-    - git config --global --add safe.directory $CI_PROJECT_DIR
-    - git clean -fdx
-    - git reset --hard
-    - rm -fr .git/rebase-merge
-    - mkdir artifacts
-    - cat /proc/cpuinfo > artifacts/cpuinfo.txt
-    - cat /proc/meminfo > artifacts/meminfo.txt
-    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mingw
-    - if [ -f pipeline_failed ] ; then exit 1 ; fi
-  artifacts:
-    when: always
-    paths:
-      - artifacts
-
-build-mingw-64:
-  extends: .build-mingw
-  variables:
-    HOST: "x86_64-w64-mingw32"
-
-build-mingw-32:
-  extends: .build-mingw
-  variables:
-    HOST: "i686-w64-mingw32"
-
-build-mac:
-  stage: build
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  allow_failure:
-    exit_codes:
-      - 2
-  interruptible: true
-  needs: []
-  dependencies: []
-  tags:
-    - mac
-  script:
-    - git config --global --add safe.directory $CI_PROJECT_DIR
-    - git clean -fdx
-    - git reset --hard
-    - rm -fr .git/rebase-merge
-    # We use a custom ICD which is not marked as a portability driver,
-    # so that test programs are not confused.
-    - ./gitlab/patch_moltenvk_icd.sh
-    - export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json"
-    - mkdir artifacts
-    - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
-    - vulkaninfo > artifacts/vulkaninfo.txt
-    - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
-    - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git
-    - cd wine
-    - mkdir build
-    - cd build
-    - ../configure --enable-win64 --without-x --without-freetype
-    - make tools/widl/widl
-    - cd ../..
-    - export PATH="$PWD/wine/build/tools/widl:$PATH"
-    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac
-    - if [ -f build_failed ] ; then exit 1 ; fi
-    - if [ -f tests_failed ] ; then exit 2 ; fi
-  variables:
-    VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing"
-    VKD3D_SHADER_CONFIG: 'force_validation'
-    MVK_CONFIG_LOG_LEVEL: 1
-  artifacts:
-    when: always
-    paths:
-      - artifacts
diff --git a/gitlab/test.yml b/gitlab/test.yml
index 97bebba53..3d1144b7b 100644
--- a/gitlab/test.yml
+++ b/gitlab/test.yml
@@ -8,28 +8,11 @@ test-win-64:
   tags:
     - win10-21h2
   script:
-    - ./artifacts/driver.cross64.exe
+    - git --version
+    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)'
   variables:
     TEST_ARCH: "64"
   artifacts:
     when: always
     paths:
       - artifacts
-
-test-win-32:
-  stage: test
-  rules:
-    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
-  interruptible: true
-  needs:
-    - job: build-crosstest
-  tags:
-    - win10-21h2
-  script:
-    - ./artifacts/driver.cross64.exe
-  variables:
-    TEST_ARCH: "32"
-  artifacts:
-    when: always
-    paths:
-      - artifacts
diff --git a/tests/driver.c b/tests/driver.c
index 504f51dfb..716461c6d 100644
--- a/tests/driver.c
+++ b/tests/driver.c
@@ -220,35 +220,24 @@ static bool run_tests_for_directory(const char *commit_dir)
     return ret;
 }
 
-int wmain(void)
+int wmain(int argc, WCHAR **wargv)
 {
-    WIN32_FIND_DATAA find_data;
-    HANDLE find_handle;
-    bool ret = true;
+    char commit_num[16], commit_hash[16], commit_dir[16];
 
     SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX);
 
-    find_handle = FindFirstFileA("artifacts/*-*", &find_data);
-    if (find_handle == INVALID_HANDLE_VALUE)
+    if (argc != 2)
     {
-        fprintf(stderr, "Cannot list commits, last error %ld.\n", GetLastError());
-        ret = false;
+        fprintf(stderr, "Call with commit number and hash %d\n", argc);
+        return 1;
     }
-    else
-    {
-        do
-        {
-            ret &= run_tests_for_directory(find_data.cFileName);
-        } while (FindNextFileA(find_handle, &find_data));
 
-        if (GetLastError() != ERROR_NO_MORE_FILES)
-        {
-            fprintf(stderr, "Cannot list tests, last error %ld.\n", GetLastError());
-            ret = false;
-        }
-
-        FindClose(find_handle);
-    }
+    WideCharToMultiByte(CP_ACP, 0, wargv[1], -1, commit_num, sizeof(commit_num), NULL, NULL);
+    WideCharToMultiByte(CP_ACP, 0, wargv[2], -1, commit_hash, sizeof(commit_hash), NULL, NULL);
+    commit_num[sizeof(commit_num) - 1] = '\0';
+    commit_hash[sizeof(commit_hash) - 1] = '\0';
+    snprintf(commit_dir, sizeof(commit_dir), "%3s-%s", commit_num, commit_hash);
+    commit_dir[sizeof(commit_dir) - 1] = '\0';
 
-    return !ret;
+    return !run_tests_for_directory(commit_dir);
 }
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/474