Move everything that does not need to be top level dir into sub dir.

[redo-blog] / test.sh

diff --git a/test.sh b/test.sh
index d930e6697d3763bb827eb6f254307b0693a59920..c54e48a23057587c007c6a6d9f7dac1c792172f0 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -2,13 +2,13 @@
 
 uuid_test()
 {
 
 uuid_test()
 {

-uuid_file="$1"
-printf "== %s UUID pattern match test ==\n" "$uuid_file"
-if cat "$uuid_file" | grep -Eq "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"; then
-  echo "== test SUCCESS =="
-else
-  echo "== test FAILURE =="
-fi
+  uuid_file="$1"
+  printf "== %s UUID pattern match test ==\n" "$uuid_file"
+  if cat "$uuid_file" | grep -Eq "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$"; then
+    echo "== test SUCCESS =="
+  else
+    echo "== test FAILURE =="
+  fi

 }
 
 diff_test()
 }
 
 diff_test()


@@ -42,13 +42,14 @@ redo
 cd "$working_dir"
 
 # Simple file comparison tests and UUID tests.
 cd "$working_dir"
 
 # Simple file comparison tests and UUID tests.

-uuid_test "$generated_files_dir""/uuid.meta"
-for file in "$expected_files_dir"/*.html "$expected_files_dir"/*.meta; do
+uuid_test "$generated_files_dir""/.meta/uuid"
+for file in "$expected_files_dir"/*.html "$expected_files_dir"/.meta/*; do

   sed_expression='s/'"$expected_files_dir_escaped"'/'"$generated_files_dir_escaped"'/'
   cmp_file=`echo "$file" | sed "$sed_expression"`
   if [ ! "$file" = "$expected_files_dir""/index.html" ] && \
       echo "$file" | grep -q "\.html$"; then
   sed_expression='s/'"$expected_files_dir_escaped"'/'"$generated_files_dir_escaped"'/'
   cmp_file=`echo "$file" | sed "$sed_expression"`
   if [ ! "$file" = "$expected_files_dir""/index.html" ] && \
       echo "$file" | grep -q "\.html$"; then

-    uuid_test "${cmp_file%.html}.uuid"
+    basename=$(basename "$cmp_file")
+    uuid_test "${generated_files_dir}/.meta/${basename%.html}.uuid"

   fi
   diff_test "$file" "$cmp_file"
 done
   fi
   diff_test "$file" "$cmp_file"
 done