Commit 4e665b1e authored by Alexandre Julliard's avatar Alexandre Julliard

winetest: Use the HEAD commit sha1 as default build id.

parent dfd6c1f2
...@@ -6,6 +6,8 @@ MODULE = winetest.exe ...@@ -6,6 +6,8 @@ MODULE = winetest.exe
APPMODE = -mconsole APPMODE = -mconsole
IMPORTS = comctl32 version user32 gdi32 advapi32 wsock32 kernel32 IMPORTS = comctl32 version user32 gdi32 advapi32 wsock32 kernel32
EXTRARCFLAGS = -DBUILD_SHA1=\"$$(GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null)\"
C_SRCS = \ C_SRCS = \
gui.c \ gui.c \
main.c \ main.c \
......
...@@ -501,6 +501,7 @@ run_tests (char *logname) ...@@ -501,6 +501,7 @@ run_tests (char *logname)
int logfile; int logfile;
char *strres, *eol, *nextline; char *strres, *eol, *nextline;
DWORD strsize; DWORD strsize;
char build[64];
SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX); SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
...@@ -539,7 +540,8 @@ run_tests (char *logname) ...@@ -539,7 +540,8 @@ run_tests (char *logname)
xprintf ("Version 4\n"); xprintf ("Version 4\n");
strres = extract_rcdata (MAKEINTRESOURCE(WINE_BUILD), STRINGRES, &strsize); strres = extract_rcdata (MAKEINTRESOURCE(WINE_BUILD), STRINGRES, &strsize);
xprintf ("Tests from build "); xprintf ("Tests from build ");
if (strres) xprintf ("%.*s", strsize, strres); if (LoadStringA( 0, IDS_BUILD_ID, build, sizeof(build) )) xprintf( "%s\n", build );
else if (strres) xprintf ("%.*s", strsize, strres);
else xprintf ("-\n"); else xprintf ("-\n");
strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize); strres = extract_rcdata (MAKEINTRESOURCE(TESTS_URL), STRINGRES, &strsize);
xprintf ("Archive: "); xprintf ("Archive: ");
......
...@@ -42,6 +42,8 @@ ...@@ -42,6 +42,8 @@
#define IDC_EDIT 4000 #define IDC_EDIT 4000
#define IDC_ABOUT 4001 #define IDC_ABOUT 4001
#define IDS_BUILD_ID 1
/* Resource types */ /* Resource types */
#define TESTRES 1000 #define TESTRES 1000
......
...@@ -24,6 +24,13 @@ ...@@ -24,6 +24,13 @@
#include "resource.h" #include "resource.h"
#ifdef BUILD_SHA1
STRINGTABLE
BEGIN
IDS_BUILD_ID BUILD_SHA1
END
#endif
IDD_TAG DIALOG 0, 0, 150, 65 IDD_TAG DIALOG 0, 0, 150, 65
STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "No tag supplied" CAPTION "No tag supplied"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment