Skip to content

Commit

Permalink
All tests passed on commit 32d9850, posting as v2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rcedgar committed Oct 26, 2024
1 parent 6ff90c8 commit d1f4b05
Show file tree
Hide file tree
Showing 11 changed files with 45 additions and 23 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Makefiled
tmp/
tmp
test_output/
github_releases/

# User-specific files
*.rsuser
Expand Down
1 change: 1 addition & 0 deletions test_results/success_list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ reseekv1.0.i86linux64[95c6b51] 2024-06-30/15:33:08
reseekv1.0.i86linux64[7e7be2b] 2024-06-30/17:57:37
reseekv1.1.i86linux64[4214cdc] 2024-08-19/15:36:10
reseekv2.0.i86linux64[497cb73] 2024-10-24/17:12:16
reseekv2.0.i86linux64[32d9850] 2024-10-26/09:57:22
11 changes: 11 additions & 0 deletions test_scripts/RUN_TESTS.bash
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ if [ ! -s ./_run_tests.bash ] ; then
exit 1
fi

if [ x$1 == x ] ; then
./recompile.bash
export reseek=../bin/reseek
else
if [ ! -x $1 ] ; then
echo Not executable $x
exit 1
fi
export reseek=$1
fi

./_run_tests.bash

if [ $? != 0 ] ; then
Expand Down
10 changes: 5 additions & 5 deletions test_scripts/_run_tests.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ echo
echo _run_tests.bash
echo

cd ../src
rm -rf o/ ../bin/reseek*
./build_linux_x86.bash
cd ../test_scripts
if [ x$reseek == x ] ; then
echo "reseek not set"
exit 1
fi

rm -rf ../test_output
mkdir ../test_output
Expand All @@ -16,7 +16,7 @@ mkdir -p ../test_results
log=../test_output/TEST_LOG.txt

date=`date "+%Y-%m-%d/%H:%M:%S"`
ver=`../bin/reseek --version | tr -d ' \n\r'`
ver=`$reseek --version | tr -d ' \n\r'`
echo $date $ver STARTED >> $log
git status >> $log

Expand Down
2 changes: 1 addition & 1 deletion test_scripts/align.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cd ../test_output

../bin/reseek \
$reseek \
-search dir.bca \
-fast \
-aln all_vs_all.aln \
Expand Down
10 changes: 5 additions & 5 deletions test_scripts/columns.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,34 +2,34 @@

cd ../test_output

../bin/reseek \
$reseek \
-search dir.bca \
-fast \
-output columns_default.tsv \
-log columns_default.log

../bin/reseek \
$reseek \
-search dir.bca \
-fast \
-columns evalue+query+target \
-output columns_same_as_default.tsv \
-log columns_same_as_default.log

../bin/reseek \
$reseek \
-search dir.bca \
-fast \
-columns std \
-output columns_std.tsv \
-log columns_std.log

../bin/reseek \
$reseek \
-search dir.bca \
-fast \
-columns query+target+qlo+qhi+ql+tlo+thi+tl+cigar+qrow+trow \
-output columns_local_rows.tsv \
-log columns_local_rows.log

../bin/reseek \
$reseek \
-search dir.bca \
-fast \
-columns query+target+qlo+qhi+ql+tlo+thi+tl+cigar+qrowg+trowg \
Expand Down
8 changes: 4 additions & 4 deletions test_scripts/convert.bash
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ cd ../test_output
ls ../test_structures/* \
> test_structures.files

../bin/reseek \
$reseek \
-convert test_structures.files \
-fasta files.fa \
-cal files.cal \
-bca files.bca \
-chainsep : \
-log convert_files.log

../bin/reseek \
$reseek \
-convert ../test_structures/ \
-fasta dir.fa \
-cal dir.cal \
Expand All @@ -26,7 +26,7 @@ function cvt() {
from=$1
opt=$2
to=$3
../bin/reseek \
$reseek \
-convert $from \
-$opt $to \
-log $to.log
Expand All @@ -39,7 +39,7 @@ cvt dir.bca cal cvt_dir_bca.cal
rm -f scop40.cal*
cp ../test_data/scop40.cal.gz .
gunzip scop40.cal.gz
../bin/reseek \
$reseek \
-convert scop40.cal \
-minchainlength 5 \
-bca scop40.bca
2 changes: 1 addition & 1 deletion test_scripts/pdb2mega.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cd ../test_output

../bin/reseek \
$reseek \
-pdb2mega ../test_structures/4v40.cif \
-output ../test_output/4v40.mega \
-log pdb2mega.log
9 changes: 9 additions & 0 deletions test_scripts/recompile.bash
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash -e

echo
echo recompile.bash
echo

cd ../src
rm -rf o/ ../bin/reseek*
./build_linux_x86.bash
6 changes: 3 additions & 3 deletions test_scripts/scop40.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

cd ../test_output

../bin/reseek \
$reseek \
-search scop40.bca \
-output scop40-fast.tsv \
-fast \
-log scop40-fast.log

../bin/reseek \
$reseek \
-search scop40.bca \
-output scop40-sensitive.tsv \
-sensitive \
-log scop40-sensitive.log

../bin/reseek \
$reseek \
-search scop40.bca \
-output scop40-evalue1.tsv \
-fast \
Expand Down
8 changes: 4 additions & 4 deletions test_scripts/search.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@

cd ../test_output

../bin/reseek \
$reseek \
-search dir.bca \
-fast \
-output search_dir.bca.tsv \
-log search_dir_bca.log

../bin/reseek \
$reseek \
-search dir.cal \
-output search_dir.cal.tsv \
-fast \
-log search_dir_cal.log

../bin/reseek \
$reseek \
-search dir.cal \
-db dir.bca \
-output search_dir_cal_bca.tsv \
-fast \
-log search_dir_cal_bca.log

../bin/reseek \
$reseek \
-search dir.bca \
-db dir.cal \
-output search_dir_bca_cal.tsv \
Expand Down

0 comments on commit d1f4b05

Please sign in to comment.