diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-11-14 05:13:59 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-11-14 05:13:59 (GMT) |
| commit | bf564e80595030578e04c235ccdab94b85eca010 (patch) | |
| tree | b9bd50755aabd7a27646b31d9357dfca624575e8 /tests/OffscreenContextWGL.cc | |
| parent | c4231685f6cba5feec8bcec324a3fd884687d56e (diff) | |
windows fixes for pretty printing test results.
Diffstat (limited to 'tests/OffscreenContextWGL.cc')
| -rw-r--r-- | tests/OffscreenContextWGL.cc | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tests/OffscreenContextWGL.cc b/tests/OffscreenContextWGL.cc index 1aa99dc..3756a82 100644 --- a/tests/OffscreenContextWGL.cc +++ b/tests/OffscreenContextWGL.cc @@ -22,6 +22,7 @@ For more info: #include <GL/gl.h> // must be included after glew.h +#include <map> #include <string> #include <sstream> @@ -57,14 +58,24 @@ string get_windows_info() SYSTEM_INFO si; GetSystemInfo(&si); + map<WORD,const char*> archs; + archs[PROCESSOR_ARCHITECTURE_AMD64] = "amd64"; + archs[PROCESSOR_ARCHITECTURE_IA64] = "itanium"; + archs[PROCESSOR_ARCHITECTURE_INTEL] = "x86"; + archs[PROCESSOR_ARCHITECTURE_UNKNOWN] = "unknown"; stringstream out; out << "OS info: " - << "Microsoft(TM) Windows(TM) " << osvi.dwMajorVersion << " " - << osvi.dwMinorVersion << " " << osvi.dwBuildNumber << " " - << osvi.szCSDVersion << "\n"; + << "Microsoft(TM) Windows(TM) " << osvi.dwMajorVersion << " " + << osvi.dwMinorVersion << " " << osvi.dwBuildNumber << " " + << osvi.szCSDVersion; + if (archs.find(si.wProcessorArchitecture) != archs.end()) + out << " " << archs[si.wProcessorArchitecture]; + out << "\n"; - out << "Machine: " << si.dwOemID << " " << si.dwProcessorType; + out << "Machine: " << si.dwProcessorType; + + return out.str(); } string offscreen_context_getinfo(OffscreenContext *ctx) @@ -72,7 +83,7 @@ string offscreen_context_getinfo(OffscreenContext *ctx) stringstream out; out << glew_dump(false); out << get_windows_info(); - return result; + return out.str(); } LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) |