On 08/29/2012 09:12 PM, Peter Hutterer wrote:
These messages are not correct when the server isn't started with the dummy
driver.
Signed-off-by: Peter Hutterer <[email protected]>
---
README | 7 +++----
configure.ac | 2 +-
src/xorg-gtest_main.cpp | 4 ++--
src/xserver.cpp | 13 ++++++-------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/README b/README
index bda4b66..6c660b0 100644
--- a/README
+++ b/README
@@ -2,10 +2,9 @@ X.Org GTest testing environment for Google Test
===============================================
Provides a Google Test environment for starting and stopping
-a dummy X server for headless testing purposes. The actual
-environment is defined in header environment.h. Please refer to
-the Google test documentation for information on how to add a custom
-environment.
+a X server for testing purposes. The actual environment is defined in header
+environment.h. Please refer to the Google test documentation for information
+on how to add a custom environment.
Moreover, a custom main() function that takes care of setting up the
environment is provided in xorg-gtest_main.cpp. This can be used as a
diff --git a/configure.ac b/configure.ac
index 9245d99..c24569f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([Dummy X.org Testing Environment for Google Test],
+AC_INIT([X.org Testing Environment for Google Test],
[0.4.0],
[],
[xorg-gtest])
diff --git a/src/xorg-gtest_main.cpp b/src/xorg-gtest_main.cpp
index 5a8a31c..2d03e6a 100644
--- a/src/xorg-gtest_main.cpp
+++ b/src/xorg-gtest_main.cpp
@@ -109,9 +109,9 @@ static int usage(int exitcode) {
std::cout << "\nAdditional options:\n";
std::cout << " --no-dummy-server: Use the currently running X server "
"for testing\n";
- std::cout << " --xorg-conf: Path to xorg dummy configuration file\n";
+ std::cout << " --xorg-conf: Path to xorg configuration file\n";
std::cout << " --server: Path to X server executable\n";
- std::cout << " --xorg-display: xorg dummy display port\n";
+ std::cout << " --xorg-display: xorg display port\n";
std::cout << " --xorg-logfile: xorg logfile filename. See -logfile in \"man
Xorg\".\n"
" Its default value is " DEFAULT_XORG_LOGFILE
".\n";
return exitcode;
diff --git a/src/xserver.cpp b/src/xserver.cpp
index 863fdde..d371421 100644
--- a/src/xserver.cpp
+++ b/src/xserver.cpp
@@ -236,23 +236,22 @@ void xorg::testing::XServer::WaitForConnections(void) {
std::string message;
message += "X server failed to start on display ";
message += GetDisplayString();
- message += ". Ensure that the \"dummy\" video driver is installed.\n"
+ message += ". Ensure that the correct video driver is installed.\n"
"If the X.org server is older than 1.12, "
"tests will need to be run as root.\nCheck ";
message += d_->options["-logfile"];
message += " for any errors";
throw std::runtime_error(message);
} else if (pid == 0) {
- sleep(1); /* Give the dummy X server some time to start */
+ sleep(1); /* Give the X server some time to start */
} else if (pid == -1) {
- throw std::runtime_error("Could not get status of dummy X server "
- "process");
+ throw std::runtime_error("Could not get status of X server process");
} else {
throw std::runtime_error("Invalid child PID returned by
Process::Wait()");
}
}
- throw std::runtime_error("Unable to open connection to dummy X server");
+ throw std::runtime_error("Unable to open connection to X server");
}
void xorg::testing::XServer::TestStartup(void) {
@@ -351,7 +350,7 @@ void xorg::testing::XServer::Start(const std::string
&program) {
bool xorg::testing::XServer::Terminate(unsigned int timeout) {
if (!Process::Terminate(timeout)) {
- std::cerr << "Warning: Failed to terminate dummy Xorg server: "
+ std::cerr << "Warning: Failed to terminate Xorg server: "
<< std::strerror(errno) << "\n";
return false;
} else
@@ -360,7 +359,7 @@ bool xorg::testing::XServer::Terminate(unsigned int
timeout) {
bool xorg::testing::XServer::Kill(unsigned int timeout) {
if (!Process::Kill(timeout)) {
- std::cerr << "Warning: Failed to kill dummy Xorg server: "
+ std::cerr << "Warning: Failed to kill Xorg server: "
<< std::strerror(errno) << "\n";
return false;
} else
Fair enough :).
Reviewed-by: Chase Douglas <[email protected]>
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
