summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--menu/tests/ChangeLog10
-rwxr-xr-xmenu/tests/menutest4
-rw-r--r--menu/tests/tests/m/result3
-rw-r--r--menu/tests/tests/n/result3
4 files changed, 14 insertions, 6 deletions
diff --git a/menu/tests/ChangeLog b/menu/tests/ChangeLog
index ae13182..8b6d258 100644
--- a/menu/tests/ChangeLog
+++ b/menu/tests/ChangeLog
@@ -1,3 +1,13 @@
+2005-02-18 Mark McLoughlin <mark@skynet.ie>
+
+ Problem pointed out by Waldo.
+
+ * menutest: don't try and run the "CVS" test :)
+
+ * tests/m/result,
+ tests/n/result: items in a hidden or deleted menu
+ should be considered allocated.
+
2004-12-08 Mark McLoughlin <mark@skynet.ie>
* tests/2/result,
diff --git a/menu/tests/menutest b/menu/tests/menutest
index 6c2ca0e..861a50d 100755
--- a/menu/tests/menutest
+++ b/menu/tests/menutest
@@ -31,6 +31,10 @@ fi
FAILED=
SUCCEEDED=
for TEST in ${TESTS}; do
+ if [ "${TEST}" == "CVS" ]; then
+ continue
+ fi
+
echo
rm -rf ${MENUTESTDIR} 2> /dev/null
mkdir ${MENUTESTDIR}
diff --git a/menu/tests/tests/m/result b/menu/tests/tests/m/result
index 82b7efb..eeb7d79 100644
--- a/menu/tests/tests/m/result
+++ b/menu/tests/tests/m/result
@@ -1,4 +1 @@
-Other/ kwrite.desktop /tmp/menutestdir/xdg_data_dir/applications/kwrite.desktop
Other/ freecell.desktop /tmp/menutestdir/xdg_data_dir/applications/freecell.desktop
-Other/ KEdit.desktop /tmp/menutestdir/xdg_data_dir/applications/KEdit.desktop
-Other/ kate.desktop /tmp/menutestdir/xdg_data_dir/applications/kate.desktop
diff --git a/menu/tests/tests/n/result b/menu/tests/tests/n/result
index 82b7efb..eeb7d79 100644
--- a/menu/tests/tests/n/result
+++ b/menu/tests/tests/n/result
@@ -1,4 +1 @@
-Other/ kwrite.desktop /tmp/menutestdir/xdg_data_dir/applications/kwrite.desktop
Other/ freecell.desktop /tmp/menutestdir/xdg_data_dir/applications/freecell.desktop
-Other/ KEdit.desktop /tmp/menutestdir/xdg_data_dir/applications/KEdit.desktop
-Other/ kate.desktop /tmp/menutestdir/xdg_data_dir/applications/kate.desktop