From 05888fd1d8c53e460c3123a9a80b494384f720e4 Mon Sep 17 00:00:00 2001 From: "Billy K. Poon" Date: Thu, 17 Mar 2022 03:04:42 -0700 Subject: [PATCH] Revert "Find libgcc_s.so.1" This reverts commit e4f8b7734ca82bee6a5a166f0be182a595c51481. --- .azure-pipelines/xfel/unix-conda-build.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.azure-pipelines/xfel/unix-conda-build.yml b/.azure-pipelines/xfel/unix-conda-build.yml index 96983a2003f..ca9876bdf7b 100644 --- a/.azure-pipelines/xfel/unix-conda-build.yml +++ b/.azure-pipelines/xfel/unix-conda-build.yml @@ -98,12 +98,6 @@ steps: fi displayName: Configure and Build -- script: | - source $(Pipeline.Workspace)/miniforge/etc/profile.d/conda.sh - conda activate $(PYTHON_VERSION) - ls ${CONDA_PREFIX}/lib/libgcc* - displayName: DEBUG - # test - script: | source $(Pipeline.Workspace)/miniforge/etc/profile.d/conda.sh @@ -116,7 +110,7 @@ steps: chmod +x $(Pipeline.Workspace)/modules/xfel_regression/merging_test_data/xfel_merge.sh chmod +x $(Pipeline.Workspace)/modules/xfel_regression/merging_test_data/merge_thermo.csh export OMP_NUM_THREADS=2 - LD_PRELOAD=${CONDA_PREFIX}/lib/libgcc_s.so.1 libtbx.run_tests_parallel module=uc_metrics module=simtbx module=xfel_regression module=LS49 nproc=2 + libtbx.run_tests_parallel module=uc_metrics module=simtbx module=xfel_regression module=LS49 nproc=2 failOnStderr: false displayName: Test