From 359da58cd2bbd195ba6b2ba3fb3f1589b82abf68 Mon Sep 17 00:00:00 2001
From: bunnie <bunnie@kosagi.com>
Date: Mon, 24 Oct 2022 00:36:30 +0800
Subject: [PATCH] rename "testing" flag to gfx-testing so as to avoid namespace
 collision

---
 services/graphics-server/Cargo.toml  | 2 +-
 services/graphics-server/src/main.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/graphics-server/Cargo.toml b/services/graphics-server/Cargo.toml
index 7e17c1d1b..a60b88a26 100644
--- a/services/graphics-server/Cargo.toml
+++ b/services/graphics-server/Cargo.toml
@@ -31,6 +31,6 @@ hosted = ["utralib/hosted"]
 renode = ["utralib/renode", "xous/renode"]
 debugprint = []
 braille = []
-testing = []
+gfx-testing = []
 ditherpunk = []
 default = []
diff --git a/services/graphics-server/src/main.rs b/services/graphics-server/src/main.rs
index 6401e2d88..ad820c12f 100644
--- a/services/graphics-server/src/main.rs
+++ b/services/graphics-server/src/main.rs
@@ -36,7 +36,7 @@ use std::sync::Arc;
 use crate::wordwrap::*;
 use core::ops::Add;
 
-#[cfg(feature = "testing")]
+#[cfg(feature = "gfx-testing")]
 mod testing;
 
 fn draw_boot_logo(display: &mut XousDisplay) {
@@ -154,7 +154,7 @@ fn wrapped_main() -> ! {
 
     let ticktimer = ticktimer_server::Ticktimer::new().unwrap();
 
-    #[cfg(feature = "testing")]
+    #[cfg(feature = "gfx-testing")]
     testing::tests();
     loop {
         if !is_panic.load(Ordering::Relaxed) { // non-panic graphics operations if we are in a panic situation