Procházet zdrojové kódy

HADOOP-3435. Remove the assuption in the scripts that bash is at
/bin/bash and fix the test patch to require bash instead of sh.
Contributed by Brice Arnould.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@662557 13f79535-47bb-0310-9956-ffa450edef68

Owen O'Malley před 17 roky
rodič
revize
e26bdc12e8
40 změnil soubory, kde provedl 43 přidání a 39 odebrání
  1. 4 0
      CHANGES.txt
  2. 1 1
      build.xml
  3. 1 1
      src/contrib/hod/bin/checknodes
  4. 1 1
      src/examples/python/compile
  5. 1 1
      src/examples/python/pyAbacus/compile
  6. 1 1
      src/test/bin/test-patch.sh
  7. 1 1
      src/test/gridmix/generateData.sh
  8. 1 1
      src/test/gridmix/gridmix-env
  9. 1 1
      src/test/gridmix/javasort/text-sort.large
  10. 1 1
      src/test/gridmix/javasort/text-sort.medium
  11. 1 1
      src/test/gridmix/javasort/text-sort.small
  12. 1 1
      src/test/gridmix/maxent/maxent.large
  13. 1 1
      src/test/gridmix/monsterQuery/monster_query.large
  14. 1 1
      src/test/gridmix/monsterQuery/monster_query.medium
  15. 1 1
      src/test/gridmix/monsterQuery/monster_query.small
  16. 1 1
      src/test/gridmix/pipesort/text-sort.large
  17. 1 1
      src/test/gridmix/pipesort/text-sort.medium
  18. 1 1
      src/test/gridmix/pipesort/text-sort.small
  19. 1 1
      src/test/gridmix/streamsort/text-sort.large
  20. 1 1
      src/test/gridmix/streamsort/text-sort.medium
  21. 1 1
      src/test/gridmix/streamsort/text-sort.small
  22. 1 1
      src/test/gridmix/submissionScripts/allThroughHod
  23. 1 1
      src/test/gridmix/submissionScripts/allToSameCluster
  24. 1 1
      src/test/gridmix/submissionScripts/maxentHod
  25. 1 1
      src/test/gridmix/submissionScripts/maxentToSameCluster
  26. 1 1
      src/test/gridmix/submissionScripts/monsterQueriesHod
  27. 1 1
      src/test/gridmix/submissionScripts/monsterQueriesToSameCluster
  28. 1 1
      src/test/gridmix/submissionScripts/sleep_if_too_busy
  29. 1 1
      src/test/gridmix/submissionScripts/textSortHod
  30. 1 1
      src/test/gridmix/submissionScripts/textSortToSameCluster
  31. 1 1
      src/test/gridmix/submissionScripts/webdataScanHod
  32. 1 1
      src/test/gridmix/submissionScripts/webdataScanToSameCluster
  33. 1 1
      src/test/gridmix/submissionScripts/webdataSortHod
  34. 1 1
      src/test/gridmix/submissionScripts/webdataSortToSameCluster
  35. 1 1
      src/test/gridmix/webdatascan/webdata_scan.large
  36. 1 1
      src/test/gridmix/webdatascan/webdata_scan.medium
  37. 1 1
      src/test/gridmix/webdatascan/webdata_scan.small
  38. 1 1
      src/test/gridmix/webdatasort/webdata_sort.large
  39. 1 1
      src/test/gridmix/webdatasort/webdata_sort.medium
  40. 1 1
      src/test/gridmix/webdatasort/webdata_sort.small

+ 4 - 0
CHANGES.txt

@@ -381,6 +381,10 @@ Trunk (unreleased changes)
     HADOOP-3340. Fix DFS metrics for BlocksReplicated, HeartbeatsNum, and
     BlockReportsAverageTime. (lohit vijayarenu via cdouglas)
 
+    HADOOP-3435. Remove the assuption in the scripts that bash is at
+    /bin/bash and fix the test patch to require bash instead of sh.
+    (Brice Arnould via omalley)
+
 Release 0.17.0 - 2008-05-18
 
   INCOMPATIBLE CHANGES

+ 1 - 1
build.xml

@@ -1137,7 +1137,7 @@
 </target>
 
 <target name="test-patch" depends="patch.check,findbugs.check,forrest.check">
-  <exec executable="sh" failonerror="true">
+  <exec executable="bash" failonerror="true">
     <arg value="${basedir}/src/test/bin/test-patch.sh"/>
     <arg value="DEVELOPER"/>
     <arg value="${patch.file}"/>

+ 1 - 1
src/contrib/hod/bin/checknodes

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with

+ 1 - 1
src/examples/python/compile

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export HADOOP_HOME=../../..
 

+ 1 - 1
src/examples/python/pyAbacus/compile

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export HADOOP_HOME=../../../../..
 

+ 1 - 1
src/test/bin/test-patch.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #set -x
 ulimit -n 1024

+ 1 - 1
src/test/gridmix/generateData.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/gridmix-env

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 ## Environment configuration

+ 1 - 1
src/test/gridmix/javasort/text-sort.large

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/javasort/text-sort.medium

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/javasort/text-sort.small

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/maxent/maxent.large

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/monsterQuery/monster_query.large

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/monsterQuery/monster_query.medium

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/monsterQuery/monster_query.small

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/pipesort/text-sort.large

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/pipesort/text-sort.medium

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/pipesort/text-sort.small

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/streamsort/text-sort.large

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/streamsort/text-sort.medium

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/streamsort/text-sort.small

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/allThroughHod

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/allToSameCluster

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/maxentHod

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/maxentToSameCluster

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/monsterQueriesHod

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/monsterQueriesToSameCluster

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/sleep_if_too_busy

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 sleep 1
 for ((java_process=$((`ps -ef|grep java|wc -l`-1)); \

+ 1 - 1
src/test/gridmix/submissionScripts/textSortHod

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/textSortToSameCluster

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/webdataScanHod

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/webdataScanToSameCluster

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/webdataSortHod

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/submissionScripts/webdataSortToSameCluster

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/webdatascan/webdata_scan.large

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/webdatascan/webdata_scan.medium

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/webdatascan/webdata_scan.small

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/webdatasort/webdata_sort.large

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/webdatasort/webdata_sort.medium

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`

+ 1 - 1
src/test/gridmix/webdatasort/webdata_sort.small

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 GRID_DIR=`dirname "$0"`
 GRID_DIR=`cd "$GRID_DIR"; pwd`