Small FileGroup tidy-up; actually build FileGroup test; rearrange test wscript.

diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc
index d364a395d6a6d2f5ad986e2e7c9ffcaf81fcd9e4..cdd78c6a30e0427c28887465a93274480934b73f 100644 (file)
--- a/src/lib/file_group.cc
+++ b/src/lib/file_group.cc
@@ -73,8 +73,6 @@ FileGroup::ensure_open_path (size_t p) const
 int64_t
 FileGroup::seek (int64_t pos, int whence) const
 {
-       int64_t const len = length ();
-       
        /* Convert pos to `full_pos', which is an offset from the start
           of all the files.
        */
@@ -91,7 +89,7 @@ FileGroup::seek (int64_t pos, int whence) const
                full_pos += pos;
                break;
        case SEEK_END:
-               full_pos = len - pos;
+               full_pos = length() - pos;
                break;
        }
 

diff --git a/test/file_group_test.cc b/test/file_group_test.cc
index 6f66d88042fec3d48bd7166b77ffdcf4a45035f2..14c01a9763d32d00963bddf94b2e4b83dddd286e 100644 (file)
--- a/test/file_group_test.cc
+++ b/test/file_group_test.cc
@@ -62,8 +62,7 @@ BOOST_AUTO_TEST_CASE (file_group_test)
                base += length[i];
        }
 
-       FileGroup fg;
-       fg.set_paths (name);
+       FileGroup fg (name);
        uint8_t test[65536];
 
        int pos = 0;

diff --git a/test/wscript b/test/wscript
index b40b6947521e913637f828428cc057148a4a8d17..5a11149040381650393df0815487f7e233fcb0c5 100644 (file)
--- a/test/wscript
+++ b/test/wscript
@@ -15,31 +15,32 @@ def build(bld):
     obj.uselib = 'BOOST_TEST DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML'
     obj.use    = 'libdcpomatic'
     obj.source = """
-                 test.cc
-                 scaling_test.cc
-                 film_metadata_test.cc
-                 frame_rate_test.cc
-                 colour_conversion_test.cc
+                 4k_test.cc
                  audio_delay_test.cc
-                 silence_padding_test.cc
                  audio_merger_test.cc
-                 resampler_test.cc
+                 black_fill_test.cc
+                 client_server_test.cc
+                 colour_conversion_test.cc
                  ffmpeg_audio_test.cc
-                 threed_test.cc
-                 play_test.cc
-                 ffmpeg_pts_offset.cc
+                 ffmpeg_dcp_test.cc
                  ffmpeg_examiner_test.cc
-                 black_fill_test.cc
-                 ratio_test.cc
-                 pixel_formats_test.cc
+                 ffmpeg_pts_offset.cc
+                 file_group_test.cc
+                 film_metadata_test.cc
+                 frame_rate_test.cc
+                 image_test.cc
+                 job_test.cc
                  make_black_test.cc
+                 pixel_formats_test.cc
+                 play_test.cc
+                 ratio_test.cc
+                 resampler_test.cc
+                 scaling_test.cc
+                 silence_padding_test.cc
                  stream_test.cc
+                 test.cc
+                 threed_test.cc
                  util_test.cc
-                 ffmpeg_dcp_test.cc
-                 job_test.cc
-                 client_server_test.cc
-                 image_test.cc
-                 4k_test.cc
                  """
 
     obj.target = 'unit-tests'