From: Kenneth Graunke <[email protected]>
This test always passes, so all it does is make sure glGetString doesn't
crash. But essentially every Piglit test that does extension checks
already does that.
---
tests/glean/CMakeLists.gl.txt | 1 -
tests/glean/tgetstr.cpp | 74 ------------------------------------------
tests/glean/tgetstr.h | 75 -------------------------------------------
3 files changed, 150 deletions(-)
delete mode 100644 tests/glean/tgetstr.cpp
delete mode 100644 tests/glean/tgetstr.h
diff --git a/tests/glean/CMakeLists.gl.txt b/tests/glean/CMakeLists.gl.txt
index abdfd8e..75b4ee3 100644
--- a/tests/glean/CMakeLists.gl.txt
+++ b/tests/glean/CMakeLists.gl.txt
@@ -36,7 +36,6 @@ piglit_add_executable (glean
tfbo.cpp
tfpexceptions.cpp
tfragprog1.cpp
- tgetstr.cpp
tglsl1.cpp
tlogicop.cpp
tmultitest.cpp
diff --git a/tests/glean/tgetstr.cpp b/tests/glean/tgetstr.cpp
deleted file mode 100644
index a32d030..0000000
--- a/tests/glean/tgetstr.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// BEGIN_COPYRIGHT -*- glean -*-
-//
-// Copyright (C) 1999 Allen Akin All Rights Reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-// KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ALLEN AKIN BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-// AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-// OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// END_COPYRIGHT
-
-// tgetstr.cpp: implementation of OpenGL glGetString() tests
-
-#include "tgetstr.h"
-#include <algorithm>
-
-using namespace std;
-
-namespace GLEAN {
-
-///////////////////////////////////////////////////////////////////////////////
-// runOne: Run a single test case
-///////////////////////////////////////////////////////////////////////////////
-void
-GetStringTest::runOne(GetStringResult& r, Window&) {
- r.vendor = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
- r.renderer = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
- r.version = reinterpret_cast<const char*>(glGetString(GL_VERSION));
- r.extensions = reinterpret_cast<const
char*>(glGetString(GL_EXTENSIONS));
- r.pass = true;
-} // GetStringTest::runOne
-
-///////////////////////////////////////////////////////////////////////////////
-// logOne: Log a single test case
-///////////////////////////////////////////////////////////////////////////////
-void
-GetStringTest::logOne(GetStringResult& r) {
- logPassFail(r);
- logConcise(r);
- if (env->options.verbosity) {
- env->log << "\tvendor: " << r.vendor << '\n';
- env->log << "\trenderer: " << r.renderer << '\n';
- env->log << "\tversion: " << r.version << '\n';
- env->log << "\textensions: " << r.extensions << '\n';
- }
-} // GetStringTest::logOne
-
-///////////////////////////////////////////////////////////////////////////////
-// The test object itself:
-///////////////////////////////////////////////////////////////////////////////
-GetStringTest getStringTest("getString", "window",
- "This test checks the contents of the strings returned by\n"
- "glGetString(): the vendor name, renderer name, version, and\n"
- "extensions. It is run on every OpenGL-capable drawing surface\n"
- "configuration that supports creation of a window.\n");
-
-} // namespace GLEAN
diff --git a/tests/glean/tgetstr.h b/tests/glean/tgetstr.h
deleted file mode 100644
index d2b5311..0000000
--- a/tests/glean/tgetstr.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// BEGIN_COPYRIGHT -*- glean -*-
-//
-// Copyright (C) 1999 Allen Akin All Rights Reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or
-// sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the
-// Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-// KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ALLEN AKIN BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-// AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-// OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// END_COPYRIGHT
-
-
-// tgetstr.h: Check OpenGL vendor, renderer, version, and extension strings
-
-// See tbasic.cpp for the basic test structure.
-
-
-#ifndef __tgetstr_h__
-#define __tgetstr_h__
-
-#include "tbase.h"
-
-namespace GLEAN {
-
-class DrawingSurfaceConfig; // Forward reference.
-
-class GetStringResult: public BaseResult {
-public:
- bool pass;
- string vendor;
- string renderer;
- string version;
- string extensions;
-
- void putresults(ostream& s) const {
- s << vendor << '\n';
- s << renderer << '\n';
- s << version << '\n';
- s << extensions << '\n';
- }
-
- bool getresults(istream& s) {
- getline(s, vendor);
- getline(s, renderer);
- getline(s, version);
- getline(s, extensions);
- return s.good();
- }
-};
-
-class GetStringTest: public BaseTest<GetStringResult> {
-public:
- GLEAN_CLASS(GetStringTest, GetStringResult);
-}; // class GetStringTest
-
-} // namespace GLEAN
-
-#endif // __tgetstr_h__
--
1.8.3.2
_______________________________________________
Piglit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/piglit
