[gpak] cleanup + [testrunner] return RUN_ALL_TESTS

gabekz · Sep 26, 2024 · 1f7d5dc · 1f7d5dc
1 parent fee9593
commit 1f7d5dc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/goodsack/gsk/gsk/asset/gpak/gpak.c b/goodsack/gsk/gsk/asset/gpak/gpak.c
@@ -56,9 +56,7 @@ gsk_gpak_write(gsk_GPAK *p_gpak, const char *str_key_uri, u64 value)
     };
     asset.uri = strdup(str_key_uri);
 
-#if 1
     // check for chaining
-    // TODO: currently only checks for a single chain..
     if (p_gpak->p_refs_table[idx].handle != 0)
     {
         gsk_GPakAssetRef *p_last =
@@ -75,12 +73,9 @@ gsk_gpak_write(gsk_GPAK *p_gpak, const char *str_key_uri, u64 value)
 
         gsk_GPakAssetRef *p_chain = malloc(sizeof(gsk_GPakAssetRef));
         *p_chain                  = asset;
-        // p_gpak->p_refs_table[idx].p_next = p_chain;
-        // p_next_loc = p_chain;
-        p_last->p_next = p_chain;
+        p_last->p_next            = p_chain;
         return;
     }
-#endif
 
     p_gpak->p_refs_table[idx] = asset;
 }

diff --git a/goodsack/gsk/gsk/asset/gpak/gpak.h b/goodsack/gsk/gsk/asset/gpak/gpak.h
@@ -22,12 +22,14 @@ typedef struct gsk_GPakAssetRef
     void *p_next; // chain pointer to next asset in linked-list
 } gsk_GPakAssetRef;
 
+#if 0
 typedef struct gsk_GPakAssetBlob
 {
     void *p_data;
     u64 data_size;
 
 } gsk_GPakAssetBlob;
+#endif
 
 typedef struct gsk_GPakContainer
 {

diff --git a/goodsack/gsk/gsk/prog/test/gsk_test_main.cpp b/goodsack/gsk/gsk/prog/test/gsk_test_main.cpp
@@ -26,7 +26,5 @@ main(int argc, char **argv)
     LOG_INFO("Begin Test Application");
 
     // Run tests
-    RUN_ALL_TESTS();
-
-    return 0;
+    return RUN_ALL_TESTS();
 }