From b9a3df5c5527b57f9633896ef5841d1c7de8f992 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sun, 29 Mar 2020 16:18:20 +0800
Subject: [PATCH] Update utest script

---
 trunk/auto/setup_variables.sh | 2 +-
 trunk/configure               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/trunk/auto/setup_variables.sh b/trunk/auto/setup_variables.sh
index 3865f005f..c144c68f5 100755
--- a/trunk/auto/setup_variables.sh
+++ b/trunk/auto/setup_variables.sh
@@ -12,7 +12,7 @@ echo "SRS_WORKDIR: ${SRS_WORKDIR}, SRS_OBJS_DIR: ${SRS_OBJS_DIR}, SRS_OBJS: ${SR
 
 # For src object files on each platform.
 (
-    cd ${SRS_OBJS_DIR} &&
+    mkdir -p ${SRS_OBJS_DIR} && cd ${SRS_OBJS_DIR} &&
     rm -rf src utest srs research include lib srs_hls_ingester srs_mp4_parser &&
     mkdir -p ${SRS_PLATFORM}/src && ln -sf ${SRS_PLATFORM}/src &&
     mkdir -p ${SRS_PLATFORM}/utest && ln -sf ${SRS_PLATFORM}/utest &&
diff --git a/trunk/configure b/trunk/configure
index d2e366f78..32cd88ea8 100755
--- a/trunk/configure
+++ b/trunk/configure
@@ -52,7 +52,7 @@ SrsLibrtmpSampleEntry="nossl"
 if [ $SRS_SSL = YES ]; then SrsLibrtmpSampleEntry="ssl";fi
 # utest make entry, (cd utest; make)
 SrsUtestMakeEntry="@echo -e \"ignore utest for it's disabled\""
-if [ $SRS_UTEST = YES ]; then SrsUtestMakeEntry="(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM}/utest; \$(MAKE))"; fi
+if [ $SRS_UTEST = YES ]; then SrsUtestMakeEntry="(cd ${SRS_OBJS_DIR}/${SRS_PLATFORM}/utest && \$(MAKE))"; fi
 
 #####################################################################################
 # finger out modules to install.
@@ -545,7 +545,7 @@ librtmp: server
 	@echo "Building the client publish/play library."
 	\$(MAKE) -f ${SRS_OBJS_DIR}/${SRS_MAKEFILE} librtmp
 	@echo "Building the srs-librtmp example."
-	(cd research/librtmp; \$(MAKE) EXTRA_CXXFLAGS="${SrsGcov}" ${SrsLibrtmpSampleEntry})
+	(cd research/librtmp && \$(MAKE) EXTRA_CXXFLAGS="${SrsGcov}" ${SrsLibrtmpSampleEntry})
 
 END
 else