Merge branch 'x64'

airbus-seclab · Jan 22, 2019 · ffa0e2b · ffa0e2b
2 parents cd9f58e + aa2c329
commit ffa0e2b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -113,7 +113,7 @@ lindist: clean all
 	cp -r lib/*.no "$(distdir)/python/idabincat/lib"
 	cp -r python/install_plugin.py README.md doc "$(distdir)"
 	# On azure, do not zip or delete $(distdir)
-ifeq ($(BUILD_BUILDID),)
+ifeq ($(AZURE_BUILD),)
 	tar cvJf "$(distdir).tar.xz" "$(distdir)"
 	-rm -rf "$(distdir)"
 endif

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -43,7 +43,7 @@ jobs:
         inputs:
           pathtoPublish: /tmp/linux-release/$(distdir)
           artifactName: $(distdir)
-      - script: docker run -v /tmp/test-results:/install/bincat/test-results -w /install/bincat/test "bincat:$BUILD_SOURCEVERSION" bash -c 'python2 -m pytest -n auto --coverage smoke -k "not repne" --junitxml=/install/bincat/test-results/pytest_report.xml || true'
+      - script: docker run -v /tmp/test-results:/install/bincat/test-results -w /install/bincat/test -e AZURE_BUILD=true "bincat:$BUILD_SOURCEVERSION" bash -c 'python2 -m pytest -n auto --coverage smoke -k "not repne" --junitxml=/install/bincat/test-results/pytest_report.xml || true'
         displayName: 'Run tests'
       - task: PublishTestResults@2
         inputs: