Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
3c66c741
Commit
3c66c741
authored
8 years ago
by
Józef Kucia
Browse files
Options
Downloads
Patches
Plain Diff
tests: Pass command line arguments to vkd3d_test_main().
parent
2eed0e0e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/private/vkd3d_test.h
+46
-9
46 additions, 9 deletions
include/private/vkd3d_test.h
with
46 additions
and
9 deletions
include/private/vkd3d_test.h
+
46
−
9
View file @
3c66c741
...
...
@@ -23,6 +23,7 @@
#ifndef __VKD3D_TEST_H
#define __VKD3D_TEST_H
#include
<assert.h>
#include
<inttypes.h>
#include
<stdarg.h>
#include
<stdbool.h>
...
...
@@ -32,11 +33,12 @@
#include
"vkd3d_common.h"
static
void
vkd3d_test_main
(
void
);
static
void
vkd3d_test_main
(
int
argc
,
char
**
argv
);
static
const
char
*
vkd3d_test_name
;
#define START_TEST(name) static const char *vkd3d_test_name = #name; \
static void vkd3d_test_main(void)
#define START_TEST(name) \
static const char *vkd3d_test_name = #name; \
static void vkd3d_test_main(int argc, char **argv)
#define ok ok_(__LINE__)
#define todo todo_(__LINE__)
...
...
@@ -177,11 +179,7 @@ vkd3d_test_debug(const char *fmt, ...)
printf
(
"%s
\n
"
,
buffer
);
}
#ifdef _WIN32
int
wmain
(
void
)
#else
int
main
(
void
)
#endif
int
main
(
int
argc
,
char
**
argv
)
{
const
char
*
vkd3d_test_debug
;
...
...
@@ -190,7 +188,7 @@ int main(void)
vkd3d_test_state
.
debug
=
(
vkd3d_test_debug
=
getenv
(
"VKD3D_TEST_DEBUG"
))
&&
(
*
vkd3d_test_debug
==
'y'
||
*
vkd3d_test_debug
==
'1'
);
vkd3d_test_main
();
vkd3d_test_main
(
argc
,
argv
);
printf
(
"%s: %lu tests executed (%lu failures, %lu skipped, %lu todo).
\n
"
,
vkd3d_test_name
,
...
...
@@ -205,6 +203,45 @@ int main(void)
return
vkd3d_test_state
.
failure_count
||
vkd3d_test_state
.
todo_success_count
;
}
#ifdef _WIN32
static
char
*
vkd3d_test_strdupWtoA
(
WCHAR
*
str
)
{
char
*
out
;
int
len
;
if
(
!
(
len
=
WideCharToMultiByte
(
CP_ACP
,
0
,
str
,
-
1
,
NULL
,
0
,
NULL
,
NULL
)))
return
NULL
;
if
(
!
(
out
=
malloc
(
len
)))
return
NULL
;
WideCharToMultiByte
(
CP_ACP
,
0
,
str
,
-
1
,
out
,
len
,
NULL
,
NULL
);
return
out
;
}
int
wmain
(
int
argc
,
WCHAR
**
wargv
)
{
char
**
argv
;
int
i
,
ret
;
argv
=
malloc
(
argc
*
sizeof
(
*
argv
));
assert
(
argv
);
for
(
i
=
0
;
i
<
argc
;
++
i
)
{
if
(
!
(
argv
[
i
]
=
vkd3d_test_strdupWtoA
(
wargv
[
i
])))
break
;
}
assert
(
i
==
argc
);
ret
=
main
(
argc
,
argv
);
for
(
i
=
0
;
i
<
argc
;
++
i
)
free
(
argv
[
i
]);
free
(
argv
);
return
ret
;
}
#endif
/* _WIN32 */
typedef
void
(
*
vkd3d_test_pfn
)(
void
);
static
inline
void
vkd3d_run_test
(
const
char
*
name
,
vkd3d_test_pfn
test_pfn
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment