always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

archive: Fix test_archive

Browse Source 
- odnt't pass any flags when invoking make in `test_archive` target
This commit is contained in:
Corentin Le Molgat
2018-09-17 10:44:54 +02:00
parent 1de99bbb67
commit 76a1327ace
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/Makefile.archive.mk
View File

@@ -151,12 +151,12 @@ test_archive: $(INSTALL_DIR)$(ARCHIVE_EXT)
$(MKDIR) $(TEMP_TEST_DIR)
ifeq ($(SYSTEM),win)
$(UNZIP) $< -d $(TEMP_TEST_DIR)
cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) && $(MAKE) all
cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) && $(MAKE) MAKEFLAGS= all
else
#this is to make sure the archive tests don't use the root libraries
$(RENAME) lib lib2
$(TAR) -xvf $< -C $(TEMP_TEST_DIR)
( cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) && $(MAKE) all ) && \
( cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) && $(MAKE) MAKEFLAGS= all ) && \
$(RENAME) lib2 lib && echo "archive test succeeded" || \
( $(RENAME) lib2 lib && echo "archive test failed" && exit 1)
endif