tools: drop the RATBAGCTL_DEVEL environ, just use RATBAG_TEST instead

Which is the same env that ratbagd uses as well. And we don't have variable
values in RATBAGCTL_DEVEL anymore, so no point in having two different
variables here.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

tools/ratbagctl.devel.in

@@ -40,7 +40,7 @@ def main(argv, start_ratbagd=True):
 
                                        # replaced by meson
     os.environ['LIBRATBAG_DATA_DIR'] = '@LIBRATBAG_DATA_DIR@'
-    os.environ['RATBAGCTL_DEVEL'] = "org.freedesktop.ratbag_devel1"
+    os.environ['RATBAG_TEST'] = "1"
 
     if not argv:
         argv = ["list"]

tools/ratbagctl.test.in

@@ -50,7 +50,7 @@ class TestRatbagCtl(unittest.TestCase):
                                      stdout=subprocess.PIPE,
                                      stderr=subprocess.PIPE,
                                      shell=True,
-                                     env={"RATBAGCTL_DEVEL": "org.freedesktop.ratbag_devel1"})
+                                     env={"RATBAG_TEST": "1"})
 
         (stdout, stderr) = ratbagctl.communicate()
         return (ratbagctl.returncode,
@@ -607,7 +607,6 @@ def setUpModule():
     # - copy the org.freedesktop.ratbag_devel1.conf to
     # /etc/dbus-1/system.d
     # - start builddir/ratbagd.devel (in gdb if need be)
-    # - set RATBAGCTL_DEVEL to org.freesktop.ratbag_devel1
     # - run builddir/ratbagctl.test
     ratbagd_process = None
     if start_ratbagd:
@@ -648,7 +647,6 @@ def parse(input_string):
 
 def main(argv):
     os.environ['RATBAG_TEST'] = '1'
-    os.environ['RATBAGCTL_DEVEL'] = "org.freedesktop.ratbag_devel1"
     resource.setrlimit(resource.RLIMIT_CORE, (0, 0))
 
     args = parse(argv)

tools/ratbagd.py

@@ -125,8 +125,8 @@ class _RatbagdDBus(GObject.GObject):
                 raise RatbagdUnavailable(e.message)
 
         ratbag1 = "org.freedesktop.ratbag1"
-        if os.environ.get('RATBAGCTL_DEVEL'):
-            ratbag1 = os.environ['RATBAGCTL_DEVEL']
+        if os.environ.get('RATBAG_TEST'):
+            ratbag1 = "org.freedesktop.ratbag_devel1"
 
         if object_path is None:
             object_path = "/" + ratbag1.replace('.', '/')

tools/toolbox.py

@@ -96,7 +96,7 @@ def start_ratbagd(verbosity=0):
         if name_owner is None:
             time.sleep(0.2)
 
-    os.environ['RATBAGCTL_DEVEL'] = "org.freedesktop.ratbag_devel1"
+    os.environ['RATBAG_TEST'] = "1"
 
     if name_owner is None or ratbagd_process.poll() is not None:
         return None