Dan Kegel : cmd: Rename reference file from .out to . exp to avoid clash with gnu make builtin rule.
Alexandre Julliard
julliard at winehq.org
Wed Feb 17 10:12:03 CST 2010
Module: wine
Branch: master
Commit: e4fd5196c2ebcf29849ba11cb1c838654bfb9ee0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd5196c2ebcf29849ba11cb1c838654bfb9ee0
Author: Dan Kegel <dank at kegel.com>
Date: Tue Feb 16 12:51:03 2010 -0800
cmd: Rename reference file from .out to .exp to avoid clash with gnu make builtin rule.
---
programs/cmd/tests/batch.c | 4 ++--
programs/cmd/tests/rsrc.rc | 4 ++--
...test_builtins.cmd.out => test_builtins.cmd.exp} | 0
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c
index 1d822a1..0b4efda 100644
--- a/programs/cmd/tests/batch.c
+++ b/programs/cmd/tests/batch.c
@@ -190,7 +190,7 @@ static void run_from_file(char *file_name)
return;
}
- sprintf(out_name, "%s.out", file_name);
+ sprintf(out_name, "%s.exp", file_name);
out_size = map_file(out_name, &out_data);
if(!out_size) {
ok(0, "Could not map file %s: %u\n", out_name, GetLastError());
@@ -236,7 +236,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG
if(!cmd_size)
return TRUE;
- sprintf(res_name, "%s.out", name);
+ sprintf(res_name, "%s.exp", name);
out_size = load_resource(res_name, "TESTOUT", &out_data);
if(!out_size)
return TRUE;
diff --git a/programs/cmd/tests/rsrc.rc b/programs/cmd/tests/rsrc.rc
index da62c11..bcb738d 100644
--- a/programs/cmd/tests/rsrc.rc
+++ b/programs/cmd/tests/rsrc.rc
@@ -19,5 +19,5 @@
/* @makedep: test_builtins.cmd */
test_builtins.cmd TESTCMD "test_builtins.cmd"
-/* @makedep: test_builtins.cmd.out */
-test_builtins.cmd.out TESTOUT "test_builtins.cmd.out"
+/* @makedep: test_builtins.cmd.exp */
+test_builtins.cmd.exp TESTOUT "test_builtins.cmd.exp"
diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.exp
similarity index 100%
rename from programs/cmd/tests/test_builtins.cmd.out
rename to programs/cmd/tests/test_builtins.cmd.exp
More information about the wine-cvs
mailing list