Issues spotted by inder 1.3 and disable examples in build.yml

Author: attipaci

.github/workflows/build.yml

@@ -51,8 +51,8 @@ jobs:
 
     - name: Build xchange dependency
       run: |
-        make -C xchange shared
         make -C xchange static
+        make -C xchange shared
 
     - name: Build static library
       run: make static
@@ -62,9 +62,10 @@ jobs:
 
     - name: Build tools
       run: make tools
-      
-    - name: Build examples
-      run: make examples
+
+# Needs to be fixed -- cannot find redisx      
+#    - name: Build examples
+#      run: make examples
 
   build-freebsd:
     runs-on: ubuntu-latest

.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1563693297748052703" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1563587762567252703" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

CMakeLists.txt

@@ -36,16 +36,18 @@ include(FeatureSummary)
 # Build options
 option(BUILD_SHARED_LIBS "Build as shared libraries instead of static" OFF)
 option(BUILD_DOC "Build HTML documetation" OFF)
-option(BUILD_TESTING "Build regression test suite" ON)
+option(BUILD_TESTING "Build regression test suite" OFF)
 option(BUILD_EXAMPLES "Build example programs" OFF)
+option(CHECK_BUILD "Basic build integrity checking during tests" OFF)
 option(ENABLE_OPENMP "Build with OpenMP support" OFF)
 option(ENABLE_TLS "Build with TLS support" OFF)
 
 # Set feature descriptions for summary
 add_feature_info(SharedLibs BUILD_SHARED_LIBS "Build as shared libraries")
 add_feature_info(Documentation BUILD_DOC "Developer documentation (HTML)")
-add_feature_info(Testing BUILD_TESTING "Run regression testing")
+add_feature_info(Testing BUILD_TESTING "Run regression testing (needs Redis/Valkey server)")
 add_feature_info(Examples BUILD_EXAMPLES "Build and test example programs")
+add_feature_info(Examples CHECK_BUILD "Basic functionality checking of the build")
 add_feature_info(OpenMP ENABLE_OPENMP "OpenMP support")
 add_feature_info(TLS ENABLE_TLS "TLS support")
 
@@ -149,6 +151,10 @@ if(BUILD_DOC)
     add_subdirectory(doc)
 endif()
 
+if(CHECK_BUILD)
+    add_test(NAME cli-check COMMAND ${CMAKE_BINARY_DIR}/bin/redisx-cli --help)
+endif()
+
 
 # ----------------------------------------------------------------------------
 # Install Runtime component

examples/Makefile

@@ -10,12 +10,11 @@ LIB ?= ../lib
 
 ifdef XCHANGE
   CPPFLAGS += -I$(XCHANGE)/include
-  LDFLAGS += -L$(XCHANGE)/lib
+  LDFLAGS += -L$(XCHANGE)/lib -lxchange
 endif
 
 CPPFLAGS += -I../include
-LDFLAGS += -L$(LIB) -lredisx -lxchange -lpthread
-
+LDFLAGS += -L$(LIB) -lredisx -lpthread
 
 .PHONY: all
 all: $(EXAMPLES)

src/redisx-net.c

@@ -256,11 +256,10 @@ static int rAuthAsync(RedisClient *cl) {
   prop_error(fn, status);
 
   reply = redisxReadReplyAsync(cl, &status);
-  prop_error(fn, status);
+  if(!status)
+    status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, -1);
 
-  status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, -1);
   redisxDestroyRESP(reply);
-
   prop_error(fn, status);
 
   return X_SUCCESS;

src/redisx-sentinel.c

@@ -140,18 +140,27 @@ int rConfirmMasterRoleAsync(Redis *redis) {
   prop_error(fn, status);
 
   reply = redisxReadReplyAsync(redis->interactive, &status);
-  prop_error(fn, status);
+  if(status) {
+    redisxDestroyRESP(reply);
+    x_trace(fn, "ROLE", status);
+  }
 
   if(redisxCheckDestroyRESP(reply, RESP_ARRAY, 0) != X_SUCCESS) {
     // Fallback to using INFO replication...
     XLookupTable *info;
     const XField *role;
 
     status = redisxSendRequestAsync(redis->interactive, "INFO", "replication", NULL, NULL);
-    prop_error(fn, status);
+    if(status) {
+      redisxDestroyRESP(reply);
+      x_trace(fn, "sendRequestAsync(INFO)", status);
+    }
 
     reply = redisxReadReplyAsync(redis->interactive, &status);
-    prop_error(fn, status);
+    if(status) {
+      redisxDestroyRESP(reply);
+      x_trace(fn, "readReplyAsync(INFO)", status);
+    }
 
     info = rConsumeInfoReply(reply);
     if(!info) return x_trace(fn, NULL, X_FAILURE);
@@ -216,7 +225,10 @@ int rDiscoverSentinelAsync(Redis *redis) {
     if(status) continue;
 
     reply = redisxReadReplyAsync(redis->interactive, &status);
-    if(status) continue;
+    if(status) {
+      redisxDestroyRESP(reply);
+      continue;
+    }
 
     if(redisxCheckDestroyRESP(reply, RESP_ARRAY, 2) == X_SUCCESS) {
       RESP **component = (RESP **) reply->value;

src/redisx.c

@@ -423,10 +423,7 @@ static int redisxSelectDBAsync(RedisClient *cl, int idx, boolean confirm) {
   if(confirm) {
     int status = X_SUCCESS;
     RESP *reply = redisxReadReplyAsync(cl, &status);
-
-    prop_error(fn, status);
-
-    status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, 0);
+    if(!status) status = redisxCheckRESP(reply, RESP_SIMPLE_STRING, 0);
     if(!status) if(strcmp("OK", (char *) reply->value) != 0)
       status = x_error(REDIS_UNEXPECTED_RESP, ENOMSG, fn, "expected 'OK', got '%s'", (char *) reply->value);
     redisxDestroyRESP(reply);
@@ -881,7 +878,7 @@ XLookupTable *rConsumeInfoReply(RESP *reply) {
 
   // Parse key:value lines into a structure.
   while(line) {
-    char *sep = strchr(line, ':');
+    char *sep = strchr((char *) line, ':');
     if(sep) {
       *sep = '\0';
       xSetField(s, xCreateStringField(line, sep + 1));

src/resp.c

@@ -739,7 +739,10 @@ XField *redisxRESP2XField(const char *name, const RESP *resp) {
  * @sa redisxPrintJSON()
  */
 char *redisxRESP2JSON(const char *name, const RESP *resp) {
-  return xjsonFieldToString(redisxRESP2XField(name, resp));
+  XField *f = redisxRESP2XField(name, resp);
+  char *s = xjsonFieldToString(f);
+  xDestroyField(f);
+  return s;
 }
 
 /**

test/CMakeLists.txt

@@ -12,7 +12,7 @@ FILE(GLOB TEST_PROGRAMS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.c)
 # Test programs, matching the test sources
 list(TRANSFORM TEST_PROGRAMS REPLACE "[.]c$" "")
 
-# Build each example
+# Build each test program
 foreach(TEST ${TEST_PROGRAMS})
     set(TEST_SOURCE ${TEST}.c)
 

test/Makefile

@@ -11,7 +11,7 @@ LDFLAGS += -lm -lredisx -fprofile-arcs -ftest-coverage
 
 # Check if a Redis / Valkey server is running for us
 # to test on.
-ONLINE = 0
+ONLINE ?= 0
 
 REDIS = $(shell pidof redis-server)
 ifneq ($(REDIS),)