Merge remote-tracking branch 'origin/release-10.2'

Author: sifa-wire

.dockerignore

@@ -6,4 +6,5 @@ c2/
 avs*.log
 zcall
 ztest
+ztest-slow
 

.gitignore

@@ -22,6 +22,7 @@ xcuserdata
 xcshareddata
 zcontrib
 ztest
+ztest-slow
 sectest
 sftloader
 devtools

Dockerfile

@@ -14,5 +14,5 @@ RUN chown -R 1015:1015 /build/avs
 
 ENV PATH="/build/avs/.cargo/bin:${PATH}"
 
-CMD make DIST=1 && build/linux-x86_64/bin/ztest && cp -R build/* /out/
+CMD make DIST=1 && build/linux-x86_64/bin/ztest && build/linux-x86_64/bin/ztest-slow && cp -R build/* /out/
 

Jenkinsfile

@@ -64,6 +64,8 @@ pipeline {
                         sh 'make test AVS_VERSION=' + version
                         // run tests
                         sh './ztest'
+                        // run slow tests
+                        sh './ztest-slow'
 
                         // cleanup old artifacts
                         sh 'rm -rf ./build/artifacts'
@@ -131,6 +133,8 @@ pipeline {
                         sh 'make test AVS_VERSION=' + version
                         // run tests
                         sh './ztest'
+                        // run slow tests
+                        sh './ztest-slow'
 
                         // build
                         sh 'make dist_clean'

mk/test.mk

@@ -4,6 +4,7 @@
 
 TEST_MK := test/srcs.mk
 TEST_BIN := ztest
+TEST_SLOW_BIN := ztest-slow
 
 include $(TEST_MK)
 
@@ -16,6 +17,12 @@ TEST_CC_OBJS := $(patsubst %.cpp,$(TEST_OBJ_PATH)/%.o,\
 			$(filter %.cpp,$(TEST_SRCS)))
 TEST_OBJS := $(TEST_C_OBJS) $(TEST_CC_OBJS)
 
+TEST_SLOW_C_OBJS := $(patsubst %.c,$(TEST_OBJ_PATH)/%.o,\
+			$(filter %.c,$(TEST_SLOW_SRCS)))
+TEST_SLOW_CC_OBJS := $(patsubst %.cpp,$(TEST_OBJ_PATH)/%.o,\
+			$(filter %.cpp,$(TEST_SLOW_SRCS)))
+TEST_SLOW_OBJS := $(TEST_SLOW_C_OBJS) $(TEST_SLOW_CC_OBJS)
+
 TEST_DEPS += $(CONTRIB_GTEST_TARGET) $(AVS_DEPS) $(MENG_DEPS)
 TEST_LIBS += $(CONTRIB_GTEST_LIBS) $(AVS_LIBS) $(MENG_LIBS)
 
@@ -34,11 +41,14 @@ ifeq ($(AVS_OS),android)
 endif
 
 -include $(TEST_OBJS:.o=.d)
+-include $(TEST_SLOW_OBJS:.o=.d)
 
 $(TEST_OBJS): $(TOOLCHAIN_MASTER) $(TEST_DEPS)
+$(TEST_SLOW_OBJS): $(TOOLCHAIN_MASTER) $(TEST_DEPS)
 
 ifeq ($(SKIP_MK_DEPS),)
 $(TEST_OBJS): $(TEST_MKS)
+$(TEST_SLOW_OBJS): $(TEST_MKS)
 endif
 
 $(TEST_C_OBJS): $(TEST_OBJ_PATH)/%.o: test/%.c
@@ -57,17 +67,38 @@ $(TEST_CC_OBJS): $(TEST_OBJ_PATH)/%.o: test/%.cpp
 		$(TEST_CPPFLAGS) $(TEST_CXXFLAGS) \
 		-c $< -o $@ $(DFLAGS)
 
+$(TEST_SLOW_C_OBJS): $(TEST_OBJ_PATH)/%.o: test/%.c
+	@echo "  CC   $(AVS_OS)-$(AVS_ARCH) test/$*.c"
+	@mkdir -p $(dir $@)
+	@$(CC)  $(CPPFLAGS) $(CFLAGS) \
+		$(AVS_CPPFLAGS) $(AVS_CFLAGS) \
+		$(TEST_CPPFLAGS) $(TEST_CFLAGS) \
+		-c $< -o $@ $(DFLAGS)
+
+$(TEST_SLOW_CC_OBJS): $(TEST_OBJ_PATH)/%.o: test/%.cpp
+	@echo "  CXX  $(AVS_OS)-$(AVS_ARCH) test/$*.cpp"
+	@mkdir -p $(dir $@)
+	@$(CXX) $(CPPFLAGS) $(CXXFLAGS) \
+		$(AVS_CPPFLAGS) $(AVS_CXXFLAGS) \
+		$(TEST_CPPFLAGS) $(TEST_CXXFLAGS) \
+		-c $< -o $@ $(DFLAGS)
+
 $(BUILD_BIN)/$(TEST_BIN)$(BIN_SUFFIX): $(TEST_OBJS) $(AVS_STATIC) $(MENG_STATIC)
 	@echo "  LD      $@"
 	@mkdir -p $(BUILD_BIN)
 	@$(CXX) $(LFLAGS) $(TEST_LFLAGS) \
 		$^ $(TEST_LIBS) $(LIBS) -o $@
 
+$(BUILD_BIN)/$(TEST_SLOW_BIN)$(BIN_SUFFIX): $(TEST_SLOW_OBJS) $(AVS_STATIC) $(MENG_STATIC)
+	@echo "  LD      $@"
+	@mkdir -p $(BUILD_BIN)
+	@$(CXX) $(LFLAGS) $(TEST_LFLAGS) \
+		$^ $(TEST_LIBS) $(LIBS) -o $@
 
 #--- Phony Targets ---
 
 .PHONY: test test_clean
-test: $(BUILD_BIN)/$(TEST_BIN)$(BIN_SUFFIX)
+test: $(BUILD_BIN)/$(TEST_BIN)$(BIN_SUFFIX) $(BUILD_BIN)/$(TEST_SLOW_BIN)$(BIN_SUFFIX)
 test_clean:
-	@rm -f $(BUILD_BIN)/$(TEST_BIN)$(BIN_SUFFIX)
+	@rm -f $(BUILD_BIN)/$(TEST_BIN)$(BIN_SUFFIX) $(BUILD_BIN)/$(TEST_SLOW_BIN)$(BIN_SUFFIX)
 

src/wcall/wcall.c

@@ -3972,6 +3972,17 @@ int wcall_set_network_quality_handler(WUSER_HANDLE wuser,
 	inst->quality.interval = (uint64_t)interval * 1000;
 	inst->quality.arg = arg;
 
+	struct le* le;
+	LIST_FOREACH(&inst->wcalls, le) {
+		struct wcall *wcall = le->data;
+
+		if (!wcall)
+			continue;
+
+		ICALL_CALLE(wcall->icall, set_quality_interval
+			, inst->quality.interval);
+	}
+
 	return 0;
 }
 

test/srcs.mk

@@ -38,6 +38,11 @@ TEST_SRCS	+= test_userlist.cpp
 TEST_SRCS	+= test_zapi.cpp
 TEST_SRCS	+= test_ztime.cpp
 
+
+TEST_SLOW_SRCS	+= main.cpp
+TEST_SLOW_SRCS	+= util.cpp
+TEST_SLOW_SRCS  += test_network_quality_handler.cpp
+
 # Conditional tests
 ifeq ($(AVS_OS),android)
 TEST_SRCS	+= test_android.cpp