Skip to content

Commit 2649479

Browse files
committed
Fix driver test
Signed-off-by: Dave Thaler <[email protected]>
1 parent 335abb0 commit 2649479

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/reusable-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ jobs:
161161
if: matrix.configurations == 'Release' && inputs.generate_release_package == true
162162
working-directory: ${{env.GITHUB_WORKSPACE}}
163163
run: |
164-
cmake -S tools\setup -B package -DEBPFFORWINDOWS_PROGRAM_DATA="${{github.workspace}}\${{env.BUILD_PLATFORM}}\${{env.BUILD_CONFIGURATION}}\package_data" "-DEBPFFORWINDOWS_VERSION=0.2.0" -DCPACK_GENERATOR=WIX
165-
cmake --build package --target package
164+
cmake -S tools\setup -B build\setup -DEBPFFORWINDOWS_PROGRAM_DATA="${{github.workspace}}\${{env.BUILD_PLATFORM}}\${{env.BUILD_CONFIGURATION}}\package_data" "-DEBPFFORWINDOWS_VERSION=0.2.0" -DCPACK_GENERATOR=WIX
165+
cmake --build build\setup --target package
166166
167167
- name: Locate the packages
168168
if: matrix.configurations == 'Release' && inputs.generate_release_package == true

scripts/install_ebpf.psm1

+3-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,9 @@ function Install-eBPFComponents
127127

128128
# Copy all binaries to system32.
129129
Copy-Item *.sys -Destination "$Env:systemroot\system32\drivers" -Force -ErrorAction Stop 2>&1 | Write-Log
130-
Copy-Item drivers\*.sys -Destination "$Env:systemroot\system32\drivers" -Force -ErrorAction Stop 2>&1 | Write-Log
130+
if (Test-Path -Path "drivers") {
131+
Copy-Item drivers\*.sys -Destination "$Env:systemroot\system32\drivers" -Force -ErrorAction Stop 2>&1 | Write-Log
132+
}
131133
if (Test-Path -Path "testing\testing") {
132134
Copy-Item testing\testing\*.sys -Destination "$Env:systemroot\system32\drivers" -Force -ErrorAction Stop 2>&1 | Write-Log
133135
}

tools/export_program_info/export_program_info.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ebpf_registry_key_t ebpf_root_registry_key = HKEY_CURRENT_USER;
2121

2222
typedef struct _ebpf_program_section_info_with_count
2323
{
24-
ebpf_program_section_info_t* section_info;
24+
_Field_size_(section_info_count) ebpf_program_section_info_t* section_info;
2525
size_t section_info_count;
2626
} ebpf_program_section_info_with_count_t;
2727

0 commit comments

Comments
 (0)