From 6591bba878837ffe0c735e79f611bc7662e6c410 Mon Sep 17 00:00:00 2001
From: George Danchev <danchev@spnet.net>
Date: Tue, 19 Jul 2011 17:02:09 +0000
Subject: [PATCH] merge remaining todo entries into TODO file, drop completed

---
 libisoburn/trunk/releng/TODO                  |  18 ++-
 libisoburn/trunk/releng/merge_into_isocontent | 109 ------------------
 2 files changed, 12 insertions(+), 115 deletions(-)
 delete mode 100755 libisoburn/trunk/releng/merge_into_isocontent

diff --git a/libisoburn/trunk/releng/TODO b/libisoburn/trunk/releng/TODO
index 80985ae8..cd698ce6 100644
--- a/libisoburn/trunk/releng/TODO
+++ b/libisoburn/trunk/releng/TODO
@@ -1,10 +1,16 @@
 
-* Try to convert most examples from xorriso(1) manpage into tests.
+* Manpage examples turned into tests
+  Convert most examples from xorriso(1) manpage into tests.
 
-* Merge 'merge_into_isocontent' into 'auto_isocontent' (former hardlinks)
+* Enhance 'auto_isocontent'
   Extend it to use some more demanding directory tree.
   MD5s should be checked. ACLs and xattr (if we are on Linux).
   All file types as of stat(2) should be tested.
+  Test various comparisons:
+  xorriso provides built-in means for comparison: 
+  xorriso -compare_r disk_path iso_rr_path
+  xorriso -indev my.iso -find /   vs. find input_dir
+  bsdtar -xf my.iso               vs. input_dir
 
 * Burning tests - maybe a new 'manual_burning' test?
   Further if we want to have a burn test (with MD5 and checkreading)
@@ -12,7 +18,7 @@
   it should not risk to burn one-time media which sit in the drive
   by mere accident.
 
-* Investigate the possibility to write some cunit-based tests
-  (http://cunit.sourceforge.net) for both xorriso.h and libisoburn.h API's.
-  The code samples could be dumped into codesamples/ directory and run by
-  auto_cxx or separate auto_ script.
+* Library unit tests - investigate the possibility to write some
+  cunit-based tests (http://cunit.sourceforge.net) for both
+  xorriso.h and libisoburn.h API's. The code samples could be put into
+  codesamples/ directory and run by auto_cxx or a separate auto_ script.
diff --git a/libisoburn/trunk/releng/merge_into_isocontent b/libisoburn/trunk/releng/merge_into_isocontent
deleted file mode 100755
index 68a4265a..00000000
--- a/libisoburn/trunk/releng/merge_into_isocontent
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-set -e
-
-START_DIR_DONT_CHANGE=`pwd`
-SELF=$(basename "$0")
-# required config items
-RELENG_XORRISO=""
-RELENG_DIR=""
-RELENG_IMG=""
-
-CONFFILE=$HOME/.libburnia-releng/${SELF}.conf
-KEEP=0
-GEN_DATA_DIR=releng_generated_data/${SELF}
-
-printf "\n$0: FAIL: SCRIPT NOT COMPLETED YET\n"
-exit 31
-
-print_help() {
- cat << HLP
-Usage:
- ${SELF} -help
-
-# using a config file ${CONFFILE}
- ${SELF} -rc [-keep]
-
-# without using a config file
- ${SELF} xorriso_cmd IN_dir OUT_image [-keep]
-
-# cleanup test generated data directory and exit
- ${SELF} -cleanup
-HLP
-}
-
-
-# Thomas:
-# xorriso provides built-in means for comparison: 
-#  -compare_r disk_path iso_rr_path
-# Possibly i will have to enhance it so that it is suitable for automatic
-# testing. (I used it mainly for testing -update_r.)
-
-# xorriso could use 
-#   -osirrox on -extract iso_rr_path disk_path
-# to pull a tree out of the image without mounting it.
-
-# One could mount the image -o loop. (Needs superuser authority.)
-
-# There is a program test/compare_file which acts on a mounted image
-# or on extracted trees i.e. completely independent of xorriso code.
-# See libisoburn/README paragraph "Testing".
-# With extracted trees one will want to use option -no_ctime.
-
-# One may use command diff -r to compare directory trees of a mounted image
-# or extracted trees.
-
-# George:
-# xorriso -indev my.iso -find /   vs. find input_dir
-# bsdtar -xf my.iso               vs. input_dir
-
-
-Sketched by Thomas:
-------------------------------------------------------------------------------
-
-  image_file=/tmp/...
-  on_disk=...
-  in_iso="$on_disk"
-  copy_on_disk=/tmp/...
-
-  if test -e "$image_file"
-  then
-    echo "TEST ENVIRONMENT ERROR: Existing image_file target:" >&2
-    ls -ld "$image_file" >&2
-    exit 1
-  fi
-  if test -e "$copy_on_disk"
-  then
-    echo "TEST ENVIRONMENT ERROR: Existing copy_on_disk target:" >&2
-    ls -ld "$copy_on_disk" >&2
-    exit 1
-  fi
-
-  # Produce simple image
-  xorriso \
-    -for_backup \
-    -outdev "$image_file" \
-    -map "$on_disk" "$in_iso"
-
-  # Copy from image to temporary disk tree
-  xorriso \
-    -for_backup \
-    -indev "$image_file" \
-    -osirrox on \
-    -extract "$in_iso" "$copy_on_disk"
-
-  # Compare original disk tree and temporary one
-  diff -r "$on_disk" "$copy_on_disk"
-  if test "$?" -ne 0
-  then
-    echo 'FAIL: Original disk tree and temporary tree differ'
-  else
-    echo "Success."
-  fi
-
-  # Clean up
-  rm -r "$copy_on_disk" "$image_file"
-
-------------------------------------------------------------------------------
-
-exit 0