Add a testcase for a bug that was introduced in Mesa.

This tree doesn't have the bug, but I'd like to bring the change that
was buggy over.

6 files changed, 132 insertions, 0 deletions

diff --git a/tests/.gitignore b/tests/.gitignore
index 9af7280..a3d6f5b 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -3,6 +3,7 @@
 collision
 delete_and_lookup
 delete_management
+deleted_key
 destroy_callback
 insert_and_lookup
 insert_many
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 13ba89f..d0b4e9f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,6 +28,7 @@ TESTS = \
 	collision \
 	delete_and_lookup \
 	delete_management \
+	deleted_key \
 	destroy_callback \
 	insert_and_lookup \
 	insert_many \
diff --git a/tests/deleted_key.c b/tests/deleted_key.c
new file mode 100644
index 0000000..944af7a
--- /dev/null
+++ b/tests/deleted_key.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2016 Broadcom Limited
+ *
+ * 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 (including the next
+ * paragraph) 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
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "hash_table.h"
+#include "fnv_hash.h"
+
+static bool deleted = false;
+
+static int
+key_equals(const void *a, const void *b)
+{
+    /* The comparison function shouldn't be called if our entry had
+     * been deleted.
+     */
+    assert(!deleted);
+
+    return strcmp(a, b) == 0;
+}
+
+int
+main(int argc, char **argv)
+{
+	struct hash_table *ht;
+	const char *str = "test1";
+	struct hash_entry *entry;
+
+	ht = hash_table_create((uint32_t (*)(const void *key))fnv1_hash_string,
+			       key_equals);
+
+	hash_table_insert(ht, str, NULL);
+	hash_table_remove(ht, str);
+	deleted = true;
+	hash_table_insert(ht, str, NULL);
+	assert(!entry);
+
+	hash_table_destroy(ht, NULL);
+
+	return 0;
+}
diff --git a/tests/set/.gitignore b/tests/set/.gitignore
index 2aeb095..ffe2af0 100644
--- a/tests/set/.gitignore
+++ b/tests/set/.gitignore
@@ -2,6 +2,7 @@
 *.trs
 delete_and_lookup
 delete_management
+deleted_key
 destroy_callback
 insert_and_lookup
 insert_many
diff --git a/tests/set/Makefile.am b/tests/set/Makefile.am
index f29605a..b93a146 100644
--- a/tests/set/Makefile.am
+++ b/tests/set/Makefile.am
@@ -25,6 +25,7 @@ LDADD = ../../libset.la
 TESTS = \
 	delete_and_lookup \
 	delete_management \
+	deleted_key \
 	destroy_callback \
 	insert_and_lookup \
 	insert_many \
diff --git a/tests/set/deleted_key.c b/tests/set/deleted_key.c
new file mode 100644
index 0000000..f674cec
--- /dev/null
+++ b/tests/set/deleted_key.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2016 Broadcom Limited
+ *
+ * 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 (including the next
+ * paragraph) 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
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include "set.h"
+#include "fnv_hash.h"
+
+static bool deleted = false;
+
+static int
+key_equals(const void *a, const void *b)
+{
+    /* The comparison function shouldn't be called if our entry had
+     * been deleted.
+     */
+    assert(!deleted);
+
+    return strcmp(a, b) == 0;
+}
+
+int
+main(int argc, char **argv)
+{
+	struct set *ht;
+	const char *str = "test1";
+	struct hash_entry *entry;
+
+	ht = set_create((uint32_t (*)(const void *key))fnv1_hash_string,
+			key_equals);
+
+	set_add(ht, str);
+	set_remove(ht, str);
+	deleted = true;
+	set_add(ht, str);
+	assert(!entry);
+
+	set_destroy(ht, NULL);
+
+	return 0;
+}