fix etree test so it will use euclid3/tools/etreeinfo

Author: meihuisu

examples/programs/etree/Makefile.am

@@ -15,10 +15,17 @@ all: $(bin_PROGRAMS)
 # Special build targets
 ############################################
 check: $(bin_PROGRAMS)
-	@( cd ${prefix}/tests/etree; \
+	@( cd ${UCVM_SRC_PATH}/work/lib/euclid3/tools; \
+	make etreeinfo; \
+	cd ${prefix}/tests/etree; \
+	ln -s ${UCVM_SRC_PATH}/work/lib/euclid3/tools/etreeinfo .; \
+	ln -s ${UCVM_SRC_PATH}/work/lib/euclid3/libsrc ../.; \
+	pwd; \
 	for i in $(bin_PROGRAMS); do \
 		./$${i}; \
-	done \
+	done;\
+	rm etreeinfo; \
+	rm ../libsrc; \
 	)
 
 install: $(bin_PROGRAMS)

examples/programs/etree/run_ucvm2etree_cvmh.sh

@@ -22,65 +22,29 @@ ${BIN_DIR}/ucvm2etree -f ./garnervalley_cvmh.conf > garnervalley_cvmh.out
 
 grep "Saving metadata" garnervalley_cvmh.out > $result_meta 
 
-head -1 garnervalley_cvmh_nogtl_0.5hz_10pts_1000ms.e |od |head -20 | sed 's/ //g' > $result
+#head -1 garnervalley_cvmh_nogtl_0.5hz_10pts_1000ms.e |od |head -20 | sed 's/ //g' > $result
+./etreeinfo garnervalley_cvmh_nogtl_0.5hz_10pts_1000ms.e > $result
 
 cat > $expect_meta << EOF_EXPECTED_META
 Saving metadata: Title:GarnerValley_0.5hz_10pts_1000ms Author:Elnza Date:02/27/2019 3 Vp(float);Vs(float);density(float) 33.640300 -116.859300 26250.000000 35000.000000 0.000000 4375.000000 1610612736 2147483648 268435456
 EOF_EXPECTED_META
 
-if [ $tmp == 'Darwin' ]; then
-##for macOS,
-
 cat > $expect << EOF_EXPECTED_RESULT
-0000000000514000000001400000000000000000000146400000000
-0000020000000000000000000000000000000000000000000000000
-*
-0000100100000000115000000000000000000000222000000000000
-0000120000000000020000000000000000000000000000000000000
-0000140000000000000000000000000000000000000000000000000
-*
-0000420046000040000000000000240000000000000000000000001
-0000440000000000000000000000015000000000014000000000061
-0000460000000020114020063070126063040067554072141032040
-0000500030040053040020163066146060557020164020064020064
-0000520062544071556072151020171066146060557020164020064
-0000540020070000000000000000000000000000000000000000000
-0000560000000000000000000000000000000000000000000000000
-*
-0040000177777177777177777177777000000000000000000000000
-0040020000237000000177777177777000151000000000000000000
-0040040000000000000000000000002000000000000000000000206
-0040060000000000000000000000000005100
-0040072
-EOF_EXPECTED_RESULT
-
-else
 
-cat > $expect << EOF_EXPECTED_RESULT
-0000000000514000000001400000000000000000000146400000000
-0000020000000000000000000000000000000000000000000000000
-*
-0000100100000000115000000000000000000000222000000000000
-0000120000000000020000000000000000000000000000000000000
-0000140000000000000000000000000000000000000000000000000
-*
-0000420046000010000000000001164000000000000000000000001
-0000440000000000000000000000015000000000014000000000061
-0000460000000020114020063070126063040067554072141032040
-0000500030040053040020163066146060557020164020064020064
-0000520062544071556072151020171066146060557020164020064
-0000540020070000000000000000000000000000000000000000000
-0000560000000000000000000000000000000000000000000000000
-*
-0010000177777177777177777177777000000000000000000000000
-0010020000006000000177777177777000151000000000000000000
-0010040000000000000000000000304000000000000000000000206
-0010060000000000000000000000000136620142400000000000000
-0010100000000103400000000000000000000000000164000002024
+Status of etree /var/www/html/UCVM_rel/web/model/UCVM_TARGET/tests/etree/garnervalley_cvmh_nogtl_0.5hz_10pts_1000ms.e
+
+Dimension:	3
+Payload size:	12
+Schema:	float Vp; float Vs; float density;
+Application metadata:	Title:GarnerValley_0.5hz_10pts_1000ms Author:Elnza Date:02/27/2019 3 Vp(float);Vs(float);density(float) 33.640300 -116.859300 26250.000000 35000.000000 0.000000 4375.000000 1610612736 2147483648 268435456
+Has interior nodes: no
+Is empty: no
+Total node count: 61312
+Maximum leaf level 8
+Minimum leaf level 6
+Average leaf level 6.743215
 EOF_EXPECTED_RESULT
 
-fi
-
 echo "Running examples_programs_ucvm2etree ucvm2etree_cvmh"
 if diff $result_meta $expect_meta > /dev/null 2>&1
 then