Remove unused features from libarchive

Try an integration test with no popen or system

Author: ccassise

CMakeLists.txt

@@ -67,11 +67,16 @@ find_package(LibArchive REQUIRED)
 set(WOWPKG_LIBS CURL::libcurl cjson LibArchive::LibArchive)
 
 if (MSVC)
-    # CMake does not set proper release flags for MSVC.
-    set(WFLAGS_RELEASE /O2 /GL /DNDEBUG /Zi /Gy)
-    set(WFLAGS /W4 "$<$<CONFIG:Release>:${WFLAGS_RELEASE}>")
+    set(WFLAGS_RELEASE /GL /O2)
+    set(LDFLAGS_RELEASE /LTCG)
+
+    # Really only needed if the config is Release.
+    if(WOWPKG_ENABLE_SANITIZERS)
+        set(WFLAGS_RELEASE ${WFLAGS_RELEASE} /Zi)
+        set(LDFLAGS_RELEASE ${LDFLAGS_RELEASE} /DEBUG)
+    endif()
 
-    set(LDFLAGS_RELEASE /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF)
+    set(WFLAGS /W4 "$<$<CONFIG:Release>:${WFLAGS_RELEASE}>")
     set(LDFLAGS "$<$<CONFIG:Release>:${LDFLAGS_RELEASE}>")
 
     # A lot of the functions suggested by this are not available on other

tests/integration/test_integration.c

@@ -5,8 +5,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <curl/curl.h>
+
 #include "addon.h"
 #include "appstate.h"
+#include "command.h"
 #include "config.h"
 #include "context.h"
 #include "list.h"
@@ -56,24 +59,51 @@ static bool is_nothing_installed(void)
 
 static void test_install_single(void)
 {
-    assert(system(WOWPKG_EXEC_PATH " install bigwigs") == 0);
-    assert(!is_addons_dir_empty());
+    // assert(system(WOWPKG_EXEC_PATH " install bigwigs") == 0);
+    // assert(!is_addons_dir_empty());
 
-    /* Check that installed addons show up in list as expected. */
-    /*
-    FILE *fpout = popen(WOWPKG_EXEC_PATH " list", "r");
-    assert(fpout != NULL);
-    char pout[32] = { '\0' };
-    assert(fscanf(fpout, "BigWigs (%31[^)])\n", pout) == 1);
-    assert(fgetc(fpout) == EOF);
-    assert(pclose(fpout) == 0);
-    */
+    // /* Check that installed addons show up in list as expected. */
+    // FILE *fpout = popen(WOWPKG_EXEC_PATH " list", "r");
+    // assert(fpout != NULL);
+    // char pout[32] = { '\0' };
+    // assert(fscanf(fpout, "BigWigs (%31[^)])\n", pout) == 1);
+    // assert(fgetc(fpout) == EOF);
+    // assert(pclose(fpout) == 0);
 
-    /* Cleanup addons directory. */
-    /*
-    assert(system(WOWPKG_EXEC_PATH " remove bigwigs") == 0);
+    // /* Cleanup addons directory. */
+    // assert(system(WOWPKG_EXEC_PATH " remove bigwigs") == 0);
+    // assert(is_addons_dir_empty());
+
+    Context ctx = { 0 };
+
+    Config *cfg = config_create();
+    assert(config_load(cfg, WOWPKG_USER_FILE_DIR "/config.ini") == 0);
+
+    curl_global_init(CURL_GLOBAL_DEFAULT);
+    CURL *curl = curl_easy_init();
+    assert(curl != NULL);
+
+    AppState *state = appstate_create();
+    assert(state != NULL);
+
+    ctx.config = cfg;
+    ctx.curl = curl;
+    ctx.state = state;
+
+    char *install_args[] = { "install", "bigwigs" };
+    assert(cmd_install(&ctx, ARRAY_SIZE(install_args), install_args, stdout) == 0);
+    assert(!is_addons_dir_empty());
+    assert(list_len(ctx.state->installed) == 1);
+
+    char *remove_args[] = { "remove", "bigwigs" };
+    assert(cmd_remove(&ctx, ARRAY_SIZE(remove_args), remove_args, stdout) == 0);
     assert(is_addons_dir_empty());
-    */
+    assert(list_len(ctx.state->installed) == 0);
+
+    appstate_destroy(state);
+    curl_easy_cleanup(curl);
+    curl_global_cleanup();
+    config_destroy(cfg);
 }
 
 static void test_install_multiple(void)
@@ -589,7 +619,7 @@ int main(void)
         exit(EXIT_FAILURE);
     }
 
-    // test_install_single();
+    test_install_single();
     // test_install_multiple();
     // test_upgrade_single();
     // test_upgrade_all();
@@ -603,7 +633,7 @@ int main(void)
 
     /* This should probably only be ran with GitHub token set, otherwise the rate
      * limit is a real concern. */
-    test_install_all();
+    // test_install_all();
 
     return EXIT_SUCCESS;
 }

vcpkg.json

@@ -4,6 +4,9 @@
     "dependencies": [
         "cjson",
         "curl",
-        "libarchive"
+        {
+            "name": "libarchive",
+            "default-features": false
+        }
     ]
-}
+}