Overview
| Comment: | Updated Win32 sanity checks to be more tolerant of different file magic
Disabled use of WINE for testing for now, since its not installed on the current system |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | b850a69d3e35914b09b216df9e0f940313d0b156 |
| User & Date: | rkeene on 2012-08-27 03:32:28 |
| Other Links: | manifest | tags |
Context
|
2012-08-27
| ||
| 16:09 | Updated to indicate win32 binaries are not runnable without WINE check-in: b6bf532c8e user: rkeene tags: trunk | |
| 03:32 |
Updated Win32 sanity checks to be more tolerant of different file magic
Disabled use of WINE for testing for now, since its not installed on the current system check-in: b850a69d3e user: rkeene tags: trunk | |
|
2012-08-26
| ||
| 16:51 | Added back fake "uname" check-in: 49b2d26ca5 user: rkeene tags: trunk | |
Changes
Modified build/test/test from [090941e14e] to [cdcc7c93e0].
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
...
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
|
iszip="1"
notk="1"
kit="${os}-${cpu}-min-static"
;;
win32|win32-*)
kitcreator="./build/make-kit-win32"
xcompile="1"
kitruncmd="wine"
;;
linux-mipsel-min|linux-mipsel-min-kitdll)
kitcreator="./build/make-kit-linux-mipsel"
runnable="0"
xcompile="1"
notk="1"
iszip="1"
................................................................................
# Verify sanity of created kit
issane=1
## Verify that Win32 builds are of correct type
## Verify that DLL builds are of correct type
case "-${version}-${kit}-" in
*-win32-kitdll-*|*-win32-*-kitdll-*)
if ! file "${createdkit}" | grep 'MS Windows (DLL)' >/dev/null; then
issane=0
fi
;;
*-kitdll-*)
if ! file "${createdkit}" | grep 'shared object' >/dev/null; then
issane=0
fi
;;
*-win32-notk-*|*-win32-*-notk-*)
if ! file "${createdkit}" | grep 'MS Windows (console)' >/dev/null; then
echo "Kit failed sanity check for being a console application" >&2
issane=0
fi
;;
*-win32-*)
if ! file "${createdkit}" | grep 'MS Windows (GUI)' >/dev/null; then
echo "Kit failed sanity check for being a GUI application" >&2
issane=0
fi
;;
esac
## Verify the build completed without warnings
|
>
|
|
|
|
|
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
...
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
|
iszip="1"
notk="1"
kit="${os}-${cpu}-min-static"
;;
win32|win32-*)
kitcreator="./build/make-kit-win32"
xcompile="1"
# XXX: Disabled for now, since I don't have WINE installed
#kitruncmd="wine"
;;
linux-mipsel-min|linux-mipsel-min-kitdll)
kitcreator="./build/make-kit-linux-mipsel"
runnable="0"
xcompile="1"
notk="1"
iszip="1"
................................................................................
# Verify sanity of created kit
issane=1
## Verify that Win32 builds are of correct type
## Verify that DLL builds are of correct type
case "-${version}-${kit}-" in
*-win32-kitdll-*|*-win32-*-kitdll-*)
if ! file "${createdkit}" | grep 'MS Windows' | grep '(DLL)' >/dev/null; then
issane=0
fi
;;
*-kitdll-*)
if ! file "${createdkit}" | grep 'shared object' >/dev/null; then
issane=0
fi
;;
*-win32-notk-*|*-win32-*-notk-*)
if ! file "${createdkit}" | grep 'MS Windows' | grep '(console)' >/dev/null; then
echo "Kit failed sanity check for being a console application" >&2
issane=0
fi
;;
*-win32-*)
if ! file "${createdkit}" | grep 'MS Windows' | grep '(GUI)' >/dev/null; then
echo "Kit failed sanity check for being a GUI application" >&2
issane=0
fi
;;
esac
## Verify the build completed without warnings
|