Menu

#5824 output-distance cleanup

Fixed
None
push
2020-03-15
2020-03-06
No

Discussion

  • Anonymous

    Anonymous - 2020-03-07
    • Needs: -->
    • Patch: new --> needs_work
     
  • Anonymous

    Anonymous - 2020-03-07

    Fails during make check

    ..
    Making input/regression/lilypond-book/out-test/suffix-tely.info < texi
    Making input/regression/lilypond-book/out-test/suffix-texi.info < texi
    Making input/regression/lilypond-book/out-test/suffix-texinfo.info < texi
    Making input/regression/lilypond-book/out-test/texinfo-include-file.html < texi
    Making input/regression/lilypond-book/out-test/texinfo-musicxml-file-options.html < texi
    Making input/regression/lilypond-book/out-test/texinfo-musicxml-file.html < texi
    Making input/regression/lilypond-book/out-test/texinfo-papersize-docs.html < texi
    Usage: output-distance.py [options] tree1 tree2 [tree3 tree4]...
    
    output-distance: error: no such option: --create-images
    /home/james/lilypond-git/build/../GNUmakefile.in:375: recipe for target 'local-check' failed
    make: *** [local-check] Error 2
    
     
  • Han-Wen Nienhuys

    • summary: output-distance refactor --> output-distance cleanup
     
  • Han-Wen Nienhuys

    commit 37c6ba676f4722a4e5a7b9965b64d46eff5e0bb1 (output-distance-test)
    Author: Han-Wen Nienhuys hanwen@lilypond.org
    Date: Fri Mar 6 16:47:26 2020 +0100

    Fix test target name in python/GNUmakefile
    

    commit 79a1f4de2ac6035bbedf0e49841581d21533d3b7
    Author: Han-Wen Nienhuys hanwen@lilypond.org
    Date: Fri Mar 6 16:32:12 2020 +0100

    scripts/build: run self-test as part of 'check' suite.
    

    commit 613d8478797784ecc9e7676639375e7f18d4abf1
    Author: Han-Wen Nienhuys hanwen@lilypond.org
    Date: Fri Mar 6 16:30:23 2020 +0100

    output-distance: avoid calling strip() on None
    

    commit 80079c73090bdd7608567c76508bc1c9f1c83d33
    Author: Han-Wen Nienhuys hanwen@lilypond.org
    Date: Fri Mar 6 11:54:12 2020 +0100

    output-distance: make self test pass again:
    
    * Remove --create-images option. This is always true.
    
    * Remove --no-compare-images option. We always compare.
    
    * Drop dynamic table headings. before/after also works
    
    * Use same options as regtest in self-test.
    
    * Check that .pngs/.jpgs are created.
    

    commit 973677710c4f7b4551a0283f1084dfa68c4357d0
    Author: Han-Wen Nienhuys hanwen@lilypond.org
    Date: Fri Mar 6 11:53:53 2020 +0100

    output-distance: remove support for stencil expression checks
    
    This must have been broken since commit c1a4e44 "don't do expression
    comparison." (Jun 2007).
    
    This also caused a self-test failure in output-distance, which means
    it hasn't been run for 13 years.
    
    Adapt for expression/origin removal.  Make test_compare_signatures pass,
    

    commit 1918da8bd677dd7ec2efd4bc1280002d20a65fce
    Author: Han-Wen Nienhuys hanwen@lilypond.org
    Date: Fri Mar 6 10:40:27 2020 +0100

    output-distance: cleanups
    
    * Centralize imports at top
    
    * Use doc strings rather than comments
    
    * Add more comments/docstrings
    
    * Remove unused GrobSignature.origin
    
    * Clarify method names:
    
    * snippet_fn_re as TextFileCompareLink instance variable
    
    * use time.time() rather than time.clock()
    
    * use log_verbose() rather than print()
    
    * set the actual centroid in GrobSignature.
    
    * remove unused axis_centroid() method
    
     
  • Han-Wen Nienhuys

     
  • Han-Wen Nienhuys

     
  • Anonymous

    Anonymous - 2020-03-07
    • Needs: -->
    • Patch: new --> needs_work
    • Type: -->
     
  • Anonymous

    Anonymous - 2020-03-07

    Fails make check

    ...
    Making input/regression/lilypond-book/out-test/suffix-texi.info < texi
    Making input/regression/lilypond-book/out-test/suffix-texinfo.info < texi
    Making input/regression/lilypond-book/out-test/texinfo-include-file.html < texi
    Making input/regression/lilypond-book/out-test/texinfo-musicxml-file-options.html < texi
    Making input/regression/lilypond-book/out-test/texinfo-musicxml-file.html < texi
    Making input/regression/lilypond-book/out-test/texinfo-papersize-docs.html < texi
    comparing input/regression/out-test-baseline
           to input/regression/out-test
      2101 signature
    Traceback (most recent call last):
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 1557, in <module>
        main ()
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 1554, in main
        compare_tree_pairs (list(zip(args[0::2], args[1::2])), out, options.threshold)
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 1253, in compare_tree_pairs
        data.compare_trees (dir1, dir2)
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 908, in compare_trees
        self.compare_directories (dir1, dir2)
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 961, in compare_directories
        self.compare_files (f1, f2)
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 967, in compare_files
        self.compare_signature_files (f1, f2)
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 1003, in compare_signature_files
        file_link.add_file_compare (f1, f2)
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 673, in add_file_compare
        s1 = read_signature_file (f1)
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 345, in read_signature_file
        entries = [string_to_entry (e) for e in entries
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 346, in <listcomp>
        if e and not e.startswith ('#')]
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 340, in string_to_entry
        fields[1] = string_to_tup (fields[1])
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 336, in string_to_tup
        return tuple (map (scheme_float, s.split (' ')))
      File "/home/james/lilypond-git/build/scripts/build/out/output-distance", line 318, in scheme_float
        return float(s)
    ValueError: could not convert string to float: '()'
    /home/james/lilypond-git/build/../GNUmakefile.in:375: recipe for target 'local-check' failed
    make: *** [local-check] Error 1
    
     
  • Han-Wen Nienhuys

    James, this changes the mechanism that does the tests. This means you can't run a regression test between the state before and after this change.

     
  • Han-Wen Nienhuys

    backward compatibility; verify that make-check actually works

    https://codereview.appspot.com/581770043

     
  • Anonymous

    Anonymous - 2020-03-08

    Passes make, make test-baseline and a full make doc

    Han-wen, you'll need to be a bit more obvious (for me anyway) if I need to test a patch in a particular way or need to make adjustments to what will and is not expected to work.

     
  • Anonymous

    Anonymous - 2020-03-08
    • Needs: -->
    • Patch: new --> review
    • Type: -->
     
  • Han-Wen Nienhuys

    no, it's fine; I should have foreseen the compatibility requirements.
    
     
  • Anonymous

    Anonymous - 2020-03-09
    • Patch: review --> countdown
     
  • Anonymous

    Anonymous - 2020-03-09

    Patch on coumntdown for March 11th.

     
  • Anonymous

    Anonymous - 2020-03-11
    • Patch: countdown --> push
     
  • Anonymous

    Anonymous - 2020-03-11

    Patch counted down, please push.

     
  • Han-Wen Nienhuys

    commit 5e87f62c45263940151f46e94b1cd2cee3f0c601
    Merge: 3baa13d1a5 b02d93b9e8
    Author: Han-Wen Nienhuys hanwen@lilypond.org
    Date: Wed Mar 11 09:00:59 2020 +0100

    Merge branch 'output-distance-test' into staging
    
    https://sourceforge.net/p/testlilyissues/issues/5824
    http://codereview.appspot.com/581770043
    
     
  • Han-Wen Nienhuys

    • status: Started --> Fixed