Skip to content

Commit f8ead25

Browse files
yayahjbyayahjb
committed
Fix various test output comparisions to use version 0.9.8
1 parent 67dad92 commit f8ead25

File tree

7 files changed

+85
-85
lines changed

7 files changed

+85
-85
lines changed

‎Makefile

+14-14
Original file line numberDiff line numberDiff line change
@@ -2804,24 +2804,24 @@ endif
28042804
cif2cbf_ehcn.cif cif2cbf_encp.cbf; rm cif2cbf_ehcn.cif
28052805
-grep -av "X-Binary-Size-Third-Dimension: 1" cif2cbf_encp.cbf | diff -a - makecbf.cbf
28062806
$(LDPREFIX) $(TIME) $(BIN)/cif2cbf -i 9ins.cif -o 9ins.cbf
2807-
-cat 9ins.cif |sed "1,1s/10/11/" | sed "2,2s/0.9.5/0.9.7/" | diff -a - 9ins.cbf
2807+
-cat 9ins.cif |sed "1,1s/10/11/" | sed "2,2s/0.9.5/0.9.8/" | diff -a - 9ins.cbf
28082808
#-cmp 9ins.cif 9ins.cbf
28092809
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_mar345_2300x2300.cbf -F example.mar2300 converted_flat.cbf
2810-
-cat converted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - converted_flat.cbf
2810+
-cat converted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - converted_flat.cbf
28112811
#-cmp converted_flat.cbf converted_flat_orig.cbf
28122812
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_mar345_2300x2300.cbf example.mar2300 converted.cbf
2813-
-cat converted_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - converted.cbf
2813+
-cat converted_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - converted.cbf
28142814
#-cmp converted.cbf converted_orig.cbf
28152815
-$(LDPREFIX) $(TIME) $(BIN)/testcell < testcell.dat > testcell.prt
28162816
-cmp testcell.prt testcell_orig.prt
28172817
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_adscquantum315_3072x3072.cbf -F -d adscquantum315 mb_LP_1_001.img adscconverted_flat.cbf
2818-
-cat adscconverted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - adscconverted_flat.cbf
2818+
-cat adscconverted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - adscconverted_flat.cbf
28192819
#-cmp adscconverted_flat.cbf adscconverted_flat_orig.cbf
28202820
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_adscquantum315_3072x3072.cbf -d adscquantum315 mb_LP_1_001.img adscconverted.cbf
2821-
-cat adscconverted_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - adscconverted.cbf
2821+
-cat adscconverted_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - adscconverted.cbf
28222822
#-cmp adscconverted.cbf adscconverted_orig.cbf
28232823
$(LDPREFIX) $(TIME) $(BIN)/adscimg2cbf --no_pad --cbf_packed,flat mb_LP_1_001.img
2824-
-cat mb_LP_1_001_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - mb_LP_1_001.cbf
2824+
-cat mb_LP_1_001_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - mb_LP_1_001.cbf
28252825
#-cmp mb_LP_1_001.cbf mb_LP_1_001_orig.cbf
28262826
ifneq ($(CLEANTESTS),)
28272827
mv mb_LP_1_001.cbf nmb_LP_1_001.cbf
@@ -2835,10 +2835,10 @@ ifneq ($(CLEANTESTS),)
28352835
rm nmb_LP_1_001.img
28362836
endif
28372837
$(LDPREFIX) $(TIME) $(BIN)/convert_minicbf -p $(TEMPLATES)/template_pilatus6m_2463x2527.cbf -d pilatus6m -v 1 insulin_pilatus6m.cbf insulin_pilatus6mconverted.cbf
2838-
-cat insulin_pilatus6mconverted_orig.cbf | sed "1,1s/1.7.6/1.7.11/" | sed "2,2s/0.9.3/0.9.7/" | diff -a - insulin_pilatus6mconverted.cbf
2838+
-cat insulin_pilatus6mconverted_orig.cbf | sed "1,1s/1.7.6/1.7.11/" | sed "2,2s/0.9.3/0.9.8/" | diff -a - insulin_pilatus6mconverted.cbf
28392839
#-cmp insulin_pilatus6mconverted.cbf insulin_pilatus6mconverted_orig.cbf
28402840
-$(LDPREFIX) $(TIME) $(BIN)/convert_minicbf -p $(TEMPLATES)/template_pilatus6m_2463x2527.cbf -d pilatus6m insulin_pilatus6m.cbf insulin_pilatus6mconverted_v2.cbf
2841-
-cat insulin_pilatus6mconverted_v2_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - insulin_pilatus6mconverted_v2.cbf
2841+
-cat insulin_pilatus6mconverted_v2_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - insulin_pilatus6mconverted_v2.cbf
28422842
#-cmp insulin_pilatus6mconverted_v2.cbf insulin_pilatus6mconverted_v2_orig.cbf
28432843
(CBF_CONVERT_MINICBF_PATH=$(BIN); export CBF_CONVERT_MINICBF_PATH; \
28442844
$(LDPREFIX) $(EXAMPLES)/batch_convert_minicbf.sh "." "minicbf_test" \
@@ -2916,17 +2916,17 @@ endif
29162916
-cd $(MINICBF_TEST); $(DIFF) i19-1.dump i19-2.dump
29172917
-cd $(MINICBF_TEST); $(DIFF) i19-1.cbf i19-2.cbf
29182918
$(LDPREFIX) $(TIME) $(BIN)/testreals
2919-
-cat testrealin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testrealout.cbf
2919+
-cat testrealin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testrealout.cbf
29202920
#-cmp testrealin.cbf testrealout.cbf
29212921
$(LDPREFIX) $(TIME) $(BIN)/testflat
2922-
-cat testflatin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testflatout.cbf
2922+
-cat testflatin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testflatout.cbf
29232923
#-cmp testflatin.cbf testflatout.cbf
29242924
$(LDPREFIX) $(TIME) $(BIN)/testflatpacked
2925-
-cat testflatpackedin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testflatpackedout.cbf
2925+
-cat testflatpackedin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testflatpackedout.cbf
29262926
#-cmp testflatpackedin.cbf testflatpackedout.cbf
29272927
ifneq ($(F90C),)
29282928
$(LDPREFIX) $(TIME) (echo testflatout.cbf | $(BIN)/test_xds_binary > test_xds_bin_testflatout.out)
2929-
-cat test_xds_bin_testflatout_orig.out | sed "2,2s/0.9.6/0.9.7/" | $(DIFF) -a - test_xds_bin_testflatout.out
2929+
-cat test_xds_bin_testflatout_orig.out | sed "2,2s/0.9.6/0.9.8/" | $(DIFF) -a - test_xds_bin_testflatout.out
29302930
#-$(DIFF) test_xds_bin_testflatout.out test_xds_bin_testflatout_orig.out
29312931
$(LDPREFIX) $(TIME) (echo testflatpackedout.cbf | $(BIN)/test_xds_binary > test_xds_bin_testflatpackedout.out)
29322932
-$(DIFF) test_xds_bin_testflatpackedout.out test_xds_bin_testflatpackedout_orig.out
@@ -2938,10 +2938,10 @@ endif
29382938
$(LDPREFIX) $(TIME) $(BIN)/sauter_test
29392939
$(LDPREFIX) $(TIME) $(BIN)/changtestcompression
29402940
$(LDPREFIX) $(TIME) $(BIN)/tiff2cbf -cn XRD1621.tif XRD1621.cbf
2941-
-cat XRD1621_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - XRD1621.cbf
2941+
-cat XRD1621_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - XRD1621.cbf
29422942
#-$(DIFF) XRD1621.cbf XRD1621_orig.cbf
29432943
$(LDPREFIX) $(TIME) $(BIN)/cif2cbf -I 4 -C 100. -L 0. -e n -c b -i XRD1621.cbf -o XRD1621_I4encbC100.cbf
2944-
-cat XRD1621_I4encbC100_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - XRD1621_I4encbC100.cbf
2944+
-cat XRD1621_I4encbC100_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - XRD1621_I4encbC100.cbf
29452945
#-$(DIFF) XRD1621_I4encbC100.cbf XRD1621_I4encbC100_orig.cbf
29462946

29472947

‎Makefile_LINUX

+14-14
Original file line numberDiff line numberDiff line change
@@ -2800,24 +2800,24 @@ endif
28002800
cif2cbf_ehcn.cif cif2cbf_encp.cbf; rm cif2cbf_ehcn.cif
28012801
-grep -av "X-Binary-Size-Third-Dimension: 1" cif2cbf_encp.cbf | diff -a - makecbf.cbf
28022802
$(LDPREFIX) $(TIME) $(BIN)/cif2cbf -i 9ins.cif -o 9ins.cbf
2803-
-cat 9ins.cif |sed "1,1s/10/11/" | sed "2,2s/0.9.5/0.9.7/" | diff -a - 9ins.cbf
2803+
-cat 9ins.cif |sed "1,1s/10/11/" | sed "2,2s/0.9.5/0.9.8/" | diff -a - 9ins.cbf
28042804
#-cmp 9ins.cif 9ins.cbf
28052805
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_mar345_2300x2300.cbf -F example.mar2300 converted_flat.cbf
2806-
-cat converted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - converted_flat.cbf
2806+
-cat converted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - converted_flat.cbf
28072807
#-cmp converted_flat.cbf converted_flat_orig.cbf
28082808
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_mar345_2300x2300.cbf example.mar2300 converted.cbf
2809-
-cat converted_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - converted.cbf
2809+
-cat converted_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - converted.cbf
28102810
#-cmp converted.cbf converted_orig.cbf
28112811
-$(LDPREFIX) $(TIME) $(BIN)/testcell < testcell.dat > testcell.prt
28122812
-cmp testcell.prt testcell_orig.prt
28132813
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_adscquantum315_3072x3072.cbf -F -d adscquantum315 mb_LP_1_001.img adscconverted_flat.cbf
2814-
-cat adscconverted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - adscconverted_flat.cbf
2814+
-cat adscconverted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - adscconverted_flat.cbf
28152815
#-cmp adscconverted_flat.cbf adscconverted_flat_orig.cbf
28162816
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_adscquantum315_3072x3072.cbf -d adscquantum315 mb_LP_1_001.img adscconverted.cbf
2817-
-cat adscconverted_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - adscconverted.cbf
2817+
-cat adscconverted_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - adscconverted.cbf
28182818
#-cmp adscconverted.cbf adscconverted_orig.cbf
28192819
$(LDPREFIX) $(TIME) $(BIN)/adscimg2cbf --no_pad --cbf_packed,flat mb_LP_1_001.img
2820-
-cat mb_LP_1_001_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - mb_LP_1_001.cbf
2820+
-cat mb_LP_1_001_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - mb_LP_1_001.cbf
28212821
#-cmp mb_LP_1_001.cbf mb_LP_1_001_orig.cbf
28222822
ifneq ($(CLEANTESTS),)
28232823
mv mb_LP_1_001.cbf nmb_LP_1_001.cbf
@@ -2831,10 +2831,10 @@ ifneq ($(CLEANTESTS),)
28312831
rm nmb_LP_1_001.img
28322832
endif
28332833
$(LDPREFIX) $(TIME) $(BIN)/convert_minicbf -p $(TEMPLATES)/template_pilatus6m_2463x2527.cbf -d pilatus6m -v 1 insulin_pilatus6m.cbf insulin_pilatus6mconverted.cbf
2834-
-cat insulin_pilatus6mconverted_orig.cbf | sed "1,1s/1.7.6/1.7.11/" | sed "2,2s/0.9.3/0.9.7/" | diff -a - insulin_pilatus6mconverted.cbf
2834+
-cat insulin_pilatus6mconverted_orig.cbf | sed "1,1s/1.7.6/1.7.11/" | sed "2,2s/0.9.3/0.9.8/" | diff -a - insulin_pilatus6mconverted.cbf
28352835
#-cmp insulin_pilatus6mconverted.cbf insulin_pilatus6mconverted_orig.cbf
28362836
-$(LDPREFIX) $(TIME) $(BIN)/convert_minicbf -p $(TEMPLATES)/template_pilatus6m_2463x2527.cbf -d pilatus6m insulin_pilatus6m.cbf insulin_pilatus6mconverted_v2.cbf
2837-
-cat insulin_pilatus6mconverted_v2_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - insulin_pilatus6mconverted_v2.cbf
2837+
-cat insulin_pilatus6mconverted_v2_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - insulin_pilatus6mconverted_v2.cbf
28382838
#-cmp insulin_pilatus6mconverted_v2.cbf insulin_pilatus6mconverted_v2_orig.cbf
28392839
(CBF_CONVERT_MINICBF_PATH=$(BIN); export CBF_CONVERT_MINICBF_PATH; \
28402840
$(LDPREFIX) $(EXAMPLES)/batch_convert_minicbf.sh "." "minicbf_test" \
@@ -2912,17 +2912,17 @@ endif
29122912
-cd $(MINICBF_TEST); $(DIFF) i19-1.dump i19-2.dump
29132913
-cd $(MINICBF_TEST); $(DIFF) i19-1.cbf i19-2.cbf
29142914
$(LDPREFIX) $(TIME) $(BIN)/testreals
2915-
-cat testrealin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testrealout.cbf
2915+
-cat testrealin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testrealout.cbf
29162916
#-cmp testrealin.cbf testrealout.cbf
29172917
$(LDPREFIX) $(TIME) $(BIN)/testflat
2918-
-cat testflatin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testflatout.cbf
2918+
-cat testflatin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testflatout.cbf
29192919
#-cmp testflatin.cbf testflatout.cbf
29202920
$(LDPREFIX) $(TIME) $(BIN)/testflatpacked
2921-
-cat testflatpackedin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testflatpackedout.cbf
2921+
-cat testflatpackedin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testflatpackedout.cbf
29222922
#-cmp testflatpackedin.cbf testflatpackedout.cbf
29232923
ifneq ($(F90C),)
29242924
$(LDPREFIX) $(TIME) (echo testflatout.cbf | $(BIN)/test_xds_binary > test_xds_bin_testflatout.out)
2925-
-cat test_xds_bin_testflatout_orig.out | sed "2,2s/0.9.6/0.9.7/" | $(DIFF) -a - test_xds_bin_testflatout.out
2925+
-cat test_xds_bin_testflatout_orig.out | sed "2,2s/0.9.6/0.9.8/" | $(DIFF) -a - test_xds_bin_testflatout.out
29262926
#-$(DIFF) test_xds_bin_testflatout.out test_xds_bin_testflatout_orig.out
29272927
$(LDPREFIX) $(TIME) (echo testflatpackedout.cbf | $(BIN)/test_xds_binary > test_xds_bin_testflatpackedout.out)
29282928
-$(DIFF) test_xds_bin_testflatpackedout.out test_xds_bin_testflatpackedout_orig.out
@@ -2934,10 +2934,10 @@ endif
29342934
$(LDPREFIX) $(TIME) $(BIN)/sauter_test
29352935
$(LDPREFIX) $(TIME) $(BIN)/changtestcompression
29362936
$(LDPREFIX) $(TIME) $(BIN)/tiff2cbf -cn XRD1621.tif XRD1621.cbf
2937-
-cat XRD1621_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - XRD1621.cbf
2937+
-cat XRD1621_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - XRD1621.cbf
29382938
#-$(DIFF) XRD1621.cbf XRD1621_orig.cbf
29392939
$(LDPREFIX) $(TIME) $(BIN)/cif2cbf -I 4 -C 100. -L 0. -e n -c b -i XRD1621.cbf -o XRD1621_I4encbC100.cbf
2940-
-cat XRD1621_I4encbC100_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - XRD1621_I4encbC100.cbf
2940+
-cat XRD1621_I4encbC100_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - XRD1621_I4encbC100.cbf
29412941
#-$(DIFF) XRD1621_I4encbC100.cbf XRD1621_I4encbC100_orig.cbf
29422942

29432943

‎Makefile_MINGW

+14-14
Original file line numberDiff line numberDiff line change
@@ -2814,24 +2814,24 @@ endif
28142814
cif2cbf_ehcn.cif cif2cbf_encp.cbf; rm cif2cbf_ehcn.cif
28152815
-grep -av "X-Binary-Size-Third-Dimension: 1" cif2cbf_encp.cbf | diff -a - makecbf.cbf
28162816
$(LDPREFIX) $(TIME) $(BIN)/cif2cbf -i 9ins.cif -o 9ins.cbf
2817-
-cat 9ins.cif |sed "1,1s/10/11/" | sed "2,2s/0.9.5/0.9.7/" | diff -a - 9ins.cbf
2817+
-cat 9ins.cif |sed "1,1s/10/11/" | sed "2,2s/0.9.5/0.9.8/" | diff -a - 9ins.cbf
28182818
#-cmp 9ins.cif 9ins.cbf
28192819
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_mar345_2300x2300.cbf -F example.mar2300 converted_flat.cbf
2820-
-cat converted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - converted_flat.cbf
2820+
-cat converted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - converted_flat.cbf
28212821
#-cmp converted_flat.cbf converted_flat_orig.cbf
28222822
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_mar345_2300x2300.cbf example.mar2300 converted.cbf
2823-
-cat converted_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - converted.cbf
2823+
-cat converted_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - converted.cbf
28242824
#-cmp converted.cbf converted_orig.cbf
28252825
-$(LDPREFIX) $(TIME) $(BIN)/testcell < testcell.dat > testcell.prt
28262826
-cmp testcell.prt testcell_orig.prt
28272827
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_adscquantum315_3072x3072.cbf -F -d adscquantum315 mb_LP_1_001.img adscconverted_flat.cbf
2828-
-cat adscconverted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - adscconverted_flat.cbf
2828+
-cat adscconverted_flat_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - adscconverted_flat.cbf
28292829
#-cmp adscconverted_flat.cbf adscconverted_flat_orig.cbf
28302830
$(LDPREFIX) $(TIME) $(BIN)/convert_image -p $(TEMPLATES)/template_adscquantum315_3072x3072.cbf -d adscquantum315 mb_LP_1_001.img adscconverted.cbf
2831-
-cat adscconverted_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - adscconverted.cbf
2831+
-cat adscconverted_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - adscconverted.cbf
28322832
#-cmp adscconverted.cbf adscconverted_orig.cbf
28332833
$(LDPREFIX) $(TIME) $(BIN)/adscimg2cbf --no_pad --cbf_packed,flat mb_LP_1_001.img
2834-
-cat mb_LP_1_001_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - mb_LP_1_001.cbf
2834+
-cat mb_LP_1_001_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - mb_LP_1_001.cbf
28352835
#-cmp mb_LP_1_001.cbf mb_LP_1_001_orig.cbf
28362836
ifneq ($(CLEANTESTS),)
28372837
mv mb_LP_1_001.cbf nmb_LP_1_001.cbf
@@ -2845,10 +2845,10 @@ ifneq ($(CLEANTESTS),)
28452845
rm nmb_LP_1_001.img
28462846
endif
28472847
$(LDPREFIX) $(TIME) $(BIN)/convert_minicbf -p $(TEMPLATES)/template_pilatus6m_2463x2527.cbf -d pilatus6m -v 1 insulin_pilatus6m.cbf insulin_pilatus6mconverted.cbf
2848-
-cat insulin_pilatus6mconverted_orig.cbf | sed "1,1s/1.7.6/1.7.11/" | sed "2,2s/0.9.3/0.9.7/" | diff -a - insulin_pilatus6mconverted.cbf
2848+
-cat insulin_pilatus6mconverted_orig.cbf | sed "1,1s/1.7.6/1.7.11/" | sed "2,2s/0.9.3/0.9.8/" | diff -a - insulin_pilatus6mconverted.cbf
28492849
#-cmp insulin_pilatus6mconverted.cbf insulin_pilatus6mconverted_orig.cbf
28502850
-$(LDPREFIX) $(TIME) $(BIN)/convert_minicbf -p $(TEMPLATES)/template_pilatus6m_2463x2527.cbf -d pilatus6m insulin_pilatus6m.cbf insulin_pilatus6mconverted_v2.cbf
2851-
-cat insulin_pilatus6mconverted_v2_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - insulin_pilatus6mconverted_v2.cbf
2851+
-cat insulin_pilatus6mconverted_v2_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - insulin_pilatus6mconverted_v2.cbf
28522852
#-cmp insulin_pilatus6mconverted_v2.cbf insulin_pilatus6mconverted_v2_orig.cbf
28532853
(CBF_CONVERT_MINICBF_PATH=$(BIN); export CBF_CONVERT_MINICBF_PATH; \
28542854
$(LDPREFIX) $(EXAMPLES)/batch_convert_minicbf.sh "." "minicbf_test" \
@@ -2926,17 +2926,17 @@ endif
29262926
-cd $(MINICBF_TEST); $(DIFF) i19-1.dump i19-2.dump
29272927
-cd $(MINICBF_TEST); $(DIFF) i19-1.cbf i19-2.cbf
29282928
$(LDPREFIX) $(TIME) $(BIN)/testreals
2929-
-cat testrealin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testrealout.cbf
2929+
-cat testrealin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testrealout.cbf
29302930
#-cmp testrealin.cbf testrealout.cbf
29312931
$(LDPREFIX) $(TIME) $(BIN)/testflat
2932-
-cat testflatin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testflatout.cbf
2932+
-cat testflatin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testflatout.cbf
29332933
#-cmp testflatin.cbf testflatout.cbf
29342934
$(LDPREFIX) $(TIME) $(BIN)/testflatpacked
2935-
-cat testflatpackedin.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - testflatpackedout.cbf
2935+
-cat testflatpackedin.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - testflatpackedout.cbf
29362936
#-cmp testflatpackedin.cbf testflatpackedout.cbf
29372937
ifneq ($(F90C),)
29382938
$(LDPREFIX) $(TIME) (echo testflatout.cbf | $(BIN)/test_xds_binary > test_xds_bin_testflatout.out)
2939-
-cat test_xds_bin_testflatout_orig.out | sed "2,2s/0.9.6/0.9.7/" | $(DIFF) -a - test_xds_bin_testflatout.out
2939+
-cat test_xds_bin_testflatout_orig.out | sed "2,2s/0.9.6/0.9.8/" | $(DIFF) -a - test_xds_bin_testflatout.out
29402940
#-$(DIFF) test_xds_bin_testflatout.out test_xds_bin_testflatout_orig.out
29412941
$(LDPREFIX) $(TIME) (echo testflatpackedout.cbf | $(BIN)/test_xds_binary > test_xds_bin_testflatpackedout.out)
29422942
-$(DIFF) test_xds_bin_testflatpackedout.out test_xds_bin_testflatpackedout_orig.out
@@ -2948,10 +2948,10 @@ endif
29482948
$(LDPREFIX) $(TIME) $(BIN)/sauter_test
29492949
$(LDPREFIX) $(TIME) $(BIN)/changtestcompression
29502950
$(LDPREFIX) $(TIME) $(BIN)/tiff2cbf -cn XRD1621.tif XRD1621.cbf
2951-
-cat XRD1621_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - XRD1621.cbf
2951+
-cat XRD1621_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - XRD1621.cbf
29522952
#-$(DIFF) XRD1621.cbf XRD1621_orig.cbf
29532953
$(LDPREFIX) $(TIME) $(BIN)/cif2cbf -I 4 -C 100. -L 0. -e n -c b -i XRD1621.cbf -o XRD1621_I4encbC100.cbf
2954-
-cat XRD1621_I4encbC100_orig.cbf | sed "2,2s/0.9.6/0.9.7/" | diff -a - XRD1621_I4encbC100.cbf
2954+
-cat XRD1621_I4encbC100_orig.cbf | sed "2,2s/0.9.6/0.9.8/" | diff -a - XRD1621_I4encbC100.cbf
29552955
#-$(DIFF) XRD1621_I4encbC100.cbf XRD1621_I4encbC100_orig.cbf
29562956

29572957

0 commit comments

Comments
 (0)