Skip to content

Commit 9c8b79b

Browse files
authored
Update ExecutionTests source so that it works when converted into HLK tests (microsoft#7765)
Currently, the contents of HLSLExec is copied (with some modifications) into an internal repo and used to build the HLK tests. Recent changes have broken this due to differences in build environments / expected includes. Longer term we should rationalize this (see microsoft#7586 and microsoft#7410), but for now some targeted changes should allow things to work again.
1 parent 33dd542 commit 9c8b79b

2 files changed

Lines changed: 7 additions & 12 deletions

File tree

tools/clang/unittests/HLSLExec/TableParameterHandler.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "TableParameterHandler.h"
2-
#include "dxc/Test/HlslTestUtils.h"
32

43
TableParameterHandler::TableParameterHandler(TableParameter *pTable,
54
size_t size)

tools/clang/unittests/HLSLExec/TableParameterHandler.h

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
#ifndef TABLE_PARAMETER_HANDLER_H
22
#define TABLE_PARAMETER_HANDLER_H
33

4-
#include <Verify.h>
5-
#include <WexString.h>
6-
#include <WexTestClass.h>
7-
#include <memory>
8-
#include <string>
9-
#include <vector>
10-
#include <wchar.h>
11-
#include <windows.h> // For LPCWSTR
12-
13-
#include "dxc/Support/Global.h" // For DXASSERT_ARGS
14-
#include "dxc/Test/HlslTestUtils.h"
4+
#include <windows.h>
5+
#ifdef _HLK_CONF
6+
#include "DxilConfTestUtils.h"
7+
#else
8+
#include "HlslTestUtils.h"
9+
#include "dxc/Support/Global.h"
10+
#endif
1511

1612
// Parameter representation for taef data-driven tests
1713
struct TableParameter {

0 commit comments

Comments
 (0)