Ignore:
Timestamp:
Jan 29, 2015, 7:38:23 AM (10 years ago)
Author:
Frederik Heber <heber@…>
Children:
7e6c0d
Parents:
27e464 (diff), 7305d5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'GUI_smallchanges' into Candidate_v1.4.10

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/regression/Potential/FitPotential/testsuite-potential-fit-potential.at

    r27e464 reea0bb  
    2121AT_SETUP([Potential - Fit morse potential to water])
    2222AT_KEYWORDS([potential parse-homologies fit-potential morse])
    23 AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
     23AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
    2424
    2525file=length_homology.dat
     
    4747AT_SETUP([Potential - Fit harmonic potential to water])
    4848AT_KEYWORDS([potential parse-homologies fit-potential harmonic])
    49 AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
     49AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
    5050
    5151file=harmonic_homology.dat
     
    7373AT_SETUP([Potential - Fit harmonic_angle potential to water])
    7474AT_KEYWORDS([potential parse-homologies fit-potential harmonic_angle])
    75 AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
     75AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
    7676
    7777file=angle_homology.dat
     
    9999AT_SETUP([Potential - Fit torsion potential to butane])
    100100AT_KEYWORDS([potential parse-homologies fit-potential torsion])
    101 AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
     101AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
    102102
    103103file=torsion_homology.dat
     
    125125AT_SETUP([Potential - Fit improper potential to ammonia])
    126126AT_KEYWORDS([potential parse-homologies fit-potential improper])
    127 AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
     127AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
    128128
    129129file=improper_homology.dat
     
    152152AT_SETUP([Potential - Fit LJ potential to argon])
    153153AT_KEYWORDS([potential parse-homologies fit-potential lennardjones])
    154 AT_SKIP_IF([../../molecuilder --help --actionname fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
     154AT_SKIP_IF([../../molecuilder --help fit-potential; if test $? -eq 5; then /bin/true; else /bin/false; fi])
    155155
    156156file=lj_homology.dat
Note: See TracChangeset for help on using the changeset viewer.